Commit 3dc4e086 authored by Keith Bennett's avatar Keith Bennett

Merge tag 'v2.6.1' into devel

Version v2.6.1

# gpg: Signature made Thu 16 Feb 08:02:53 2017 GMT
# gpg:                using RSA key DB4F7D61DB1CE84F
# gpg: Good signature from "Keith Bennett <k.bennett@warwick.ac.uk>" [ultimate]
# gpg:                 aka "Keith Bennett <dr.keith.bennett@gmail.com>" [ultimate]
parents e09a6b87 d270e186
......@@ -28,7 +28,7 @@ add_executable(sdf2ascii sdf2ascii.c)
add_dependencies(sdf2ascii commit_info.h)
target_link_libraries(sdf2ascii sdfc dl)
add_executable(sdffilter sdffilter.c)
add_executable(sdffilter sdffilter.c sdf_vtk_writer.c)
add_dependencies(sdffilter commit_info.h)
target_link_libraries(sdffilter sdfc dl m)
......
......@@ -30,7 +30,7 @@
#include <mpi.h>
#endif
#define VERSION "2.6.0"
#define VERSION "2.6.1"
#define DBG_FLUSH() do { \
if (h && h->dbg_buf) { \
......
......@@ -1585,7 +1585,7 @@ MOD_INIT(sdf)
if (!m)
return MOD_ERROR_VAL;
PyModule_AddStringConstant(m, "__version__", "2.6.0");
PyModule_AddStringConstant(m, "__version__", "2.6.1");
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.6.0"
#define VERSION "2.6.1"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define ABS(a) (((a) < 0.0) ? -(a) : (a))
......@@ -1721,10 +1721,23 @@ int diff_block(sdf_file_t **handles, sdf_block_t *b1, sdf_block_t *b2, int inum)
if (b1->datatype != b2->datatype) gotdiff = 1;
if (b1->ndims != b2->ndims) gotdiff = 1;
for (i = 0; i < b1->ndims; i++) {
if (b1->dims[i] == b2->dims[i])
continue;
gotdiff = 1;
switch (b1->blocktype) {
case SDF_BLOCKTYPE_PLAIN_DERIVED:
case SDF_BLOCKTYPE_PLAIN_VARIABLE:
case SDF_BLOCKTYPE_POINT_DERIVED:
case SDF_BLOCKTYPE_POINT_VARIABLE:
case SDF_BLOCKTYPE_ARRAY:
case SDF_BLOCKTYPE_LAGRANGIAN_MESH:
case SDF_BLOCKTYPE_PLAIN_MESH:
case SDF_BLOCKTYPE_POINT_MESH:
for (i = 0; i < b1->ndims; i++) {
if (b1->dims[i] == b2->dims[i])
continue;
gotdiff = 1;
}
break;
default:
break;
}
if (gotdiff) {
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.6.0"
#define VERSION "2.6.1"
#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