OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed broken build for Eikonal stuff

Browse Source
This commit is contained in:
James E McClure 2018-01-24 16:19:55 -05:00
parent 38ceb73cfe
commit f9efe6a47b
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/CMakeLists.txt
View File

@ -1,9 +1,9 @@
# Copy files for the tests # Copy files for the tests
ADD_LBPM_EXECUTABLE( lbpm_nonnewtonian_simulator ) #ADD_LBPM_EXECUTABLE( lbpm_nonnewtonian_simulator )
ADD_LBPM_EXECUTABLE( lbpm_permeability_simulator ) #ADD_LBPM_EXECUTABLE( lbpm_permeability_simulator )
ADD_LBPM_EXECUTABLE( lbpm_nondarcy_simulator ) #ADD_LBPM_EXECUTABLE( lbpm_nondarcy_simulator )
ADD_LBPM_EXECUTABLE( lbpm_color_simulator ) #ADD_LBPM_EXECUTABLE( lbpm_color_simulator )
ADD_LBPM_EXECUTABLE( lbpm_color_macro_simulator ) #ADD_LBPM_EXECUTABLE( lbpm_color_macro_simulator )
ADD_LBPM_EXECUTABLE( lbpm_sphere_pp ) ADD_LBPM_EXECUTABLE( lbpm_sphere_pp )
ADD_LBPM_EXECUTABLE( lbpm_random_pp ) ADD_LBPM_EXECUTABLE( lbpm_random_pp )
ADD_LBPM_EXECUTABLE( lbpm_refine_pp ) ADD_LBPM_EXECUTABLE( lbpm_refine_pp )
@ -20,7 +20,7 @@ ADD_LBPM_EXECUTABLE( lbpm_inkbottle_pp )
ADD_LBPM_EXECUTABLE( lbpm_plates_pp ) ADD_LBPM_EXECUTABLE( lbpm_plates_pp )
ADD_LBPM_EXECUTABLE( lbpm_squaretube_pp ) ADD_LBPM_EXECUTABLE( lbpm_squaretube_pp )
ADD_LBPM_EXECUTABLE( lbpm_BlobAnalysis ) ADD_LBPM_EXECUTABLE( lbpm_BlobAnalysis )
ADD_LBPM_EXECUTABLE( TestBubble ) #ADD_LBPM_EXECUTABLE( TestBubble )
ADD_LBPM_EXECUTABLE( ComponentLabel ) ADD_LBPM_EXECUTABLE( ComponentLabel )
ADD_LBPM_EXECUTABLE( ColorToBinary ) ADD_LBPM_EXECUTABLE( ColorToBinary )
ADD_LBPM_EXECUTABLE( BlobAnalysis ) ADD_LBPM_EXECUTABLE( BlobAnalysis )
@ -33,18 +33,18 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cylindertest ${CMAKE_CURRENT_BINARY_
# Add the tests # Add the tests
ADD_LBPM_TEST( pmmc_cylinder ) ADD_LBPM_TEST( pmmc_cylinder )
ADD_LBPM_TEST( TestBubble ) #ADD_LBPM_TEST( TestBubble )
ADD_LBPM_TEST( TestTorus ) ADD_LBPM_TEST( TestTorus )
ADD_LBPM_TEST( TestFluxBC ) ADD_LBPM_TEST( TestFluxBC )
ADD_LBPM_TEST( TestInterfaceSpeed ) ADD_LBPM_TEST( TestInterfaceSpeed )
ADD_LBPM_TEST( TestSphereCurvature ) ADD_LBPM_TEST( TestSphereCurvature )
ADD_LBPM_TEST_1_2_4( TestTwoPhase ) #ADD_LBPM_TEST_1_2_4( TestTwoPhase )
ADD_LBPM_TEST_1_2_4( TestBlobIdentify ) ADD_LBPM_TEST_1_2_4( TestBlobIdentify )
ADD_LBPM_TEST_PARALLEL( TestTwoPhase 8 ) #ADD_LBPM_TEST_PARALLEL( TestTwoPhase 8 )
ADD_LBPM_TEST_PARALLEL( TestBlobAnalyze 8 ) ADD_LBPM_TEST_PARALLEL( TestBlobAnalyze 8 )
ADD_LBPM_TEST_PARALLEL( TestSegDist 8 ) ADD_LBPM_TEST_PARALLEL( TestSegDist 8 )
ADD_LBPM_TEST_PARALLEL( TestCommD3Q19 8 ) #ADD_LBPM_TEST_PARALLEL( TestCommD3Q19 8 )
ADD_LBPM_TEST_PARALLEL( TestMassConservationD3Q7 1 ) #ADD_LBPM_TEST_PARALLEL( TestMassConservationD3Q7 1 )
ADD_LBPM_TEST_1_2_4( testCommunication ) ADD_LBPM_TEST_1_2_4( testCommunication )
ADD_LBPM_TEST_1_2_4( testUtilities ) ADD_LBPM_TEST_1_2_4( testUtilities )
ADD_LBPM_TEST( TestWriter ) ADD_LBPM_TEST( TestWriter )

2
tests/TestSegDist.cpp
View File

@ -11,6 +11,8 @@
#include <fstream> #include <fstream>
#include "common/Array.h" #include "common/Array.h"
#include "common/Domain.h" #include "common/Domain.h"
#include "analysis/eikonal.h"
int main(int argc, char **argv) int main(int argc, char **argv)
{ {

3
tests/lbpm_segmented_pp.cpp
View File

@ -11,7 +11,8 @@
#include <sstream> #include <sstream>
#include "common/Array.h" #include "common/Array.h"
#include "common/Domain.h" #include "common/Domain.h"
#include "common/TwoPhase.h" #include "analysis/TwoPhase.h"
#include "analysis/eikonal.h"
inline void MeanFilter(DoubleArray &Mesh){ inline void MeanFilter(DoubleArray &Mesh){
for (int k=1; k<(int)Mesh.size(2)-1; k++){ for (int k=1; k<(int)Mesh.size(2)-1; k++){