Commit Graph

655 Commits

Author SHA1 Message Date
James E McClure
a7968f6d13 Fixed merge conflicts again 2015-03-20 12:31:32 -04:00
James McClure
8ea190b5e6 Fixed merge conflicts in lbpm_BlobAnalysis 2015-03-20 12:29:01 -04:00
James McClure
a0b24b9934 UPdate tests/lbpm_BlobAnalysis 2015-03-20 12:27:00 -04:00
James E McClure
0db3870c1c Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2015-03-20 12:25:30 -04:00
James E McClure
77b2170e81 This commit will probably cause merge conflicts :( 2015-03-20 12:25:23 -04:00
Mark Berrill
73de72edd6 Updating ctest_script to specify the library type 2015-03-13 10:06:55 -04:00
Mark Berrill
1b3152e690 Seperating cuda and c++ flags. Fixing some compile warnings. 2015-03-12 20:52:10 -04:00
Mark Berrill
a60ee4ca99 Fixing test_Utilities failure on MAC 2015-03-11 16:29:05 -04:00
James E McClure
ba66da2d0f small changes to lbpm_BlobAnalysis 2015-03-07 15:37:04 -05:00
Mark Berrill
6d7e45ddc4 Updating ctest script 2015-03-07 10:25:13 -05:00
Mark Berrill
30d5e564b8 Updating ctest script for titan 2015-03-06 20:55:30 -05:00
Mark Berrill
202552a67a More work on valgrind 2015-03-06 11:40:10 -05:00
Mark Berrill
eef33a9a28 Minor updates to valgrind and example output tests 2015-03-06 11:01:14 -05:00
Mark Berrill
03bd04aa30 Creating an intentional memory leak to ensure valgrind is working 2015-03-06 09:40:05 -05:00
Mark Berrill
8a1bb62679 Updating valgrind suppression file 2015-03-06 09:32:55 -05:00
Mark Berrill
a03426ef0c Merge branch 'master' of https://github.com/JamesEMcClure/LBPM-WIA 2015-03-06 09:19:42 -05:00
Mark Berrill
a94696ea0d Fixing some compile errors for clang 2015-03-06 09:19:30 -05:00
James
be584b5d63 Setting up data structures for blob analysis in lbpm_BlobAnalysis.cpp 2015-03-05 23:16:02 -05:00
Mark Berrill
d3e5b4e816 Merge branch 'master' of https://github.com/JamesEMcClure/LBPM-WIA 2015-03-05 16:58:48 -05:00
Mark Berrill
ceb5669d35 Updating ValgrindSuppresionFile 2015-03-05 16:58:34 -05:00
James E McClure
e25a4510a5 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2015-03-05 15:52:17 -05:00
James E McClure
be7aacdb8a Added tests/lbpm_BlobAnalysis to analyze non-wetting phase features in parallel 2015-03-05 15:52:09 -05:00
Mark Berrill
9c27ded4b1 Updating shared_ptr cmake file 2015-03-05 15:33:48 -05:00
Mark Berrill
46903e4494 Fixing some compile errors with clang 2015-03-05 15:04:22 -05:00
Mark Berrill
e0ab2445bb Adding option to check example output 2015-03-05 12:55:24 -05:00
James E McClure
3177cec2cc tests/BlobIdentify is working as a serial phase identification tool. Has a weird memory error from double free that needs to be culled 2015-03-04 15:56:20 -05:00
James E McClure
94a04cbaf7 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2015-03-02 15:06:26 -05:00
James E McClure
673bd7e2cc Updated BlobIdentify.cpp to test bad malloc error 2015-03-02 15:06:13 -05:00
Mark Berrill
76162c6a22 Updating cmake files to try and fix compile bug on EOS 2015-02-25 11:45:23 -05:00
James E McClure
bee68191c2 Updated Blob Identify algorithm 2015-02-25 09:59:21 -05:00
Mark Berrill
5d09dbfc68 Fixing minor bug in ctest script 2015-02-20 08:56:04 -05:00
James E McClure
7bdc84730e Re-factored tests/TestInterfaceSpeed 2015-02-18 14:46:15 -05:00
James E McClure
8fb9b19ac9 Re-factored tests/TestInterfaceSpeed 2015-02-18 14:41:23 -05:00
James E McClure
bbd611619a Fixed all memory leaks in test/TestInterfaceSpeed by fixing common/PointList.h 2015-02-18 14:09:24 -05:00
James E McClure
b6d7f53a45 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2015-02-18 13:55:45 -05:00
James E McClure
1579a981ec Fixed valgrind error from mismatched free / delete in common/Array.h 2015-02-18 13:55:37 -05:00
Mark Berrill
698cfb7298 Updating ctest script for weekly tests 2015-02-16 10:16:03 -05:00
Mark Berrill
0d9ba5b07a Continuing work on cmake/ctest 2015-02-13 13:02:07 -05:00
Mark Berrill
636ddeb7b0 more updates to ctest_script 2015-02-13 12:10:43 -05:00
Mark Berrill
9f817b52d8 Updating ctest script 2015-02-13 11:48:04 -05:00
Mark Berrill
47c1a10451 Fixing compile error and warnings 2015-02-13 11:43:41 -05:00
James E McClure
82a8136bae modified TwoPhase:ColorToSignDistance 2015-02-04 16:35:17 -05:00
James E McClure
f6f1776951 Fixed bug in the phase ID field in Dm.id in simulators 2015-02-04 15:45:33 -05:00
James E McClure
a26a241b69 slight implementation change to make pgi compilers on titna happy 2015-02-04 13:01:10 -05:00
Mark Berrill
cd2f3168ca Merge branch 'master' of https://github.com/JamesEMcClure/LBPM-WIA 2015-02-04 09:55:52 -05:00
Mark Berrill
02a0b42c03 Fixing errors when compiling without c++11, changing GNU to use c++98 2015-02-04 09:55:22 -05:00
James E McClure
7ae8922466 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2015-02-02 17:10:36 -05:00
James E McClure
5f02c8e3db Fixed the bug from tests/lb2_Color_wia_mpi in tests/lbpm_color_simulator 2015-02-02 17:09:21 -05:00
Mark Berrill
49c013c3bb Changing test timeout, fixing a failing test, fixing a minor bug in CMake 2015-02-02 15:38:02 -05:00
Mark Berrill
3c6732d03e Fixing compile error on platforms/filesystems that are case insensitive (MAC) due to MPI.h including mpi.h which included itself rather than including mpi 2015-02-02 12:01:32 -05:00