Commit Graph

842 Commits

Author SHA1 Message Date
James E McClure
cc341cff86 Merge branch 'master' of https://github.com/JamesEMcClure/LBPM-WIA 2015-06-02 18:04:22 -04:00
James E McClure
0e155faa7c Debugging tests/BlobAnalyzeParallel.cpp 2015-06-02 18:04:03 -04:00
James E McClure
f3e5b1cb94 Merge branch 'master' of https://github.com/JamesEMcClure/LBPM-WIA 2015-06-02 17:57:34 -04:00
James E McClure
b9d907a642 Debugging tests/BlobAnalyzeParallel.cpp 2015-06-02 17:56:37 -04:00
James E McClure
873ec628ff Merge branch 'master' of https://github.com/JamesEMcClure/LBPM-WIA 2015-06-02 17:54:02 -04:00
James E McClure
c2109341e4 Debugging tests/BlobAnalyzeParallel.cpp 2015-06-02 17:53:34 -04:00
James E McClure
60c1f0e302 Merge branch 'master' of https://github.com/JamesEMcClure/LBPM-WIA 2015-06-02 15:49:13 -04:00
James E McClure
0deca75eab version of tests/BlobAnalyzeParalell now compiles 2015-06-02 15:44:41 -04:00
James E McClure
856b95870a debuging BlobAnalyzeParalleld 2015-06-02 15:38:34 -04:00
James E McClure
aafa7dbe24 debuging BlobAnalyzeParalleld 2015-06-02 15:36:00 -04:00
James E McClure
48b0e8042a Debugging tests/BlobAnalyzeParallel 2015-06-02 15:29:00 -04:00
James E McClure
5f16f7dc57 Added configuration script for desktop workstation 2015-06-02 15:26:37 -04:00
James E McClure
2558b5ce1b Updated tests/CMakeLists.txt 2015-06-02 15:25:48 -04:00
James E McClure
48eda6f759 Added analysis to tests/BlobAnalyzeParallel 2015-06-02 15:24:36 -04:00
James E McClure
91def9d841 Created tests/BlobAnalyzeParallel from tests/BlobIdentifyParallel 2015-06-02 15:17:09 -04:00
James E McClure
4c84495609 Updated common/TwoPhase.h so that averaging routines are only called when an entity exists 2015-06-02 14:34:08 -04:00
James E McClure
a07b392426 Updated common/TwoPhase.h so that averaging routines are only called when an entity exists 2015-06-02 14:27:43 -04:00
James E McClure
5d5edcc911 Updated common/TwoPhase.h so that averaging routines are only called when an entity exists 2015-06-02 14:22:57 -04:00
James E McClure
dda498e0cf Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2015-06-02 13:13:29 -04:00
James E McClure
139cd209d4 Updated BlobAnalysis.cpp 2015-05-18 16:30:27 -04:00
James E McClure
a6b8fe00a8 Added wetting phase properties to blobstats.tcat from tests/BlobAnalysis.cpp 2015-05-18 12:12:36 -04:00
James E McClure
87fa225361 Working on distance computations 2015-05-15 17:10:56 -04:00
Mark Berrill
49753252c8 Fixing compile errors and warnings with PGI 2015-04-28 12:26:27 -04:00
Mark Berrill
b7634dc099 Adding parallel blob identification 2015-04-28 11:34:57 -04:00
Mark Berrill
ef25839769 Replacing Array class with another Array class 2015-04-22 14:23:55 -04:00
James E McClure
d33c1abd71 Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA 2015-04-17 15:01:53 -04:00
James E McClure
f75eb35005 Changed loop index in blobstate lbpm_BlobAnalysis.cpp 2015-04-17 15:01:44 -04:00
James E McClure
a7faebdf9e Updated blobstate algorithm so that only blobs larger than 64 voxels are included 2015-04-16 12:35:25 -04:00
Mark Berrill
197b788330 Adding check on Array to ensure it is within bounds (debug mode only) 2015-04-16 10:54:58 -04:00
James E McClure
1f212e2b68 Noticed problem with pressure averaging 2015-04-15 23:39:34 -04:00
James E McClure
3dfe6fc1dd Parallel blob analysis seems to be working need to add unit test 2015-04-15 22:52:47 -04:00
James McClure
3ca0368700 Equilibrium blob averaging and removal in tests/lbpm_BlobAnalysis.cpp -- implemented without unit test 2015-04-14 16:22:57 -04:00
James McClure
99b0dbb806 Basic blob averaging in parallel tests/lbpm_BlobAnalysis and common/TwoPhase.h 2015-04-13 16:56:03 -04:00
James McClure
96c3b00407 Committing transitional changes 2015-04-10 12:54:01 -04:00
James McClure
36290d7537 Still working on tests/lbpm_BlobAnalysis.cpp 2015-03-22 22:30:53 -04:00
James E McClure
762d195a42 Partially through blob averaging 2015-03-22 21:13:17 -04:00
James E McClure
fc496a2574 Got tests/lbpm_BlobAnalysis.cpp to compile 2015-03-20 15:13:33 -04:00
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