Commit d58e661a authored by Keith Bennett's avatar Keith Bennett

Merge branch 'release/2.5.15'

parents 06e4539b 5c7f2ced
......@@ -47,6 +47,7 @@ if [ $clean -le 1 ] ; then
gcc $OPT -o sdf2ascii sdf2ascii.c -lsdfc -ldl || errcode=1
gcc $OPT -o sdffilter sdffilter.c -lsdfc -ldl -lm || errcode=1
gcc $OPT -o sdfdiff sdfdiff.c -lsdfc -ldl -lm || errcode=1
./sdf2ascii -V > /dev/null || rm -f sdf2ascii
# Test if python is new enough for the --user flag
user=$($PYTHONCMD -c 'import sys, os
newenough = sys.hexversion > 0x02060000
......
......@@ -24,11 +24,13 @@
#include "sdf.h"
#include "commit_info.h"
#define SDF_DEBUG
#ifdef PARALLEL
#include <mpi.h>
#endif
#define VERSION "2.4.14"
#define VERSION "2.4.15"
#define DBG_FLUSH() do { \
if (h && h->dbg_buf) { \
......@@ -254,6 +256,14 @@ int main(int argc, char **argv)
sdf_block_t *b;
comm_t comm;
if (sdf_has_debug_info() == 0) {
fprintf(stderr, "ERROR: sdf2ascii has been linked against a copy of "
"the SDF C library that has\n"
" no debug info. Both library and sdf2ascii utility must "
"be recompiled.\n");
return 1;
}
file = parse_args(&argc, &argv);
#ifdef PARALLEL
......
This diff is collapsed.
......@@ -1583,7 +1583,7 @@ MOD_INIT(sdf)
if (!m)
return MOD_ERROR_VAL;
PyModule_AddStringConstant(m, "__version__", "2.4.14");
PyModule_AddStringConstant(m, "__version__", "2.4.15");
PyModule_AddStringConstant(m, "__commit_id__", SDF_COMMIT_ID);
PyModule_AddStringConstant(m, "__commit_date__", SDF_COMMIT_DATE);
s = sdf_get_library_commit_id();
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.14"
#define VERSION "2.4.15"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define ABS(a) (((a) < 0.0) ? -(a) : (a))
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.14"
#define VERSION "2.4.15"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
......
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