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

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
James E McClure
2015-02-02 17:10:36 -05:00
parent 5f02c8e3db 49c013c3bb
commit 7ae8922466
28 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IO/MeshDatabase.cpp
View File

@@ -1,7 +1,7 @@
#include "IO/MeshDatabase.h"
#include "IO/Mesh.h"
#include "IO/IOHelpers.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include "common/Utilities.h"
#include <vector>

2
IO/MeshDatabase.h
View File

@@ -2,7 +2,7 @@
#define MeshDatabase_INC
#include "IO/Mesh.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include <iostream>
#include <string.h>

6
IO/PIO.cpp
View File

@@ -1,16 +1,12 @@
#include "IO/PIO.h"
#include "common/Utilities.h"
#include "common/MPI_Helpers.h"
#include <fstream>
#include <string>
#include <cstring>
#ifdef USE_MPI
#include "mpi.h"
#endif
namespace IO {

2
IO/Writer.cpp
View File

@@ -1,7 +1,7 @@
#include "IO/Writer.h"
#include "IO/MeshDatabase.h"
#include "IO/IOHelpers.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include "common/Utilities.h"
#include <sys/stat.h>

14
cmake/ctest_script.cmake
View File

@@ -145,15 +145,15 @@ ELSE()
ENDIF()
# Set timeouts: 5 minutes for debug, 2 for opt, and 30 minutes for valgrind/weekly
# Set timeouts: 30 minutes for debug, 15 for opt, and 60 minutes for valgrind/weekly
IF ( USE_VALGRIND )
SET( CTEST_TEST_TIMEOUT 1800 )
SET( CTEST_TEST_TIMEOUT 3600 )
ELSEIF ( RUN_WEEKLY )
SET( CTEST_TEST_TIMEOUT 1800 )
SET( CTEST_TEST_TIMEOUT 3600 )
ELSEIF( ${CMAKE_BUILD_TYPE} STREQUAL "Debug" )
SET( CTEST_TEST_TIMEOUT 300 )
SET( CTEST_TEST_TIMEOUT 1800 )
ELSE()
SET( CTEST_TEST_TIMEOUT 120 )
SET( CTEST_TEST_TIMEOUT 900 )
ENDIF()
@@ -227,7 +227,7 @@ SET( DROP_SITE_CDASH TRUE )
CTEST_SUBMIT()
# Clean up
# exec_program("make distclean")
# Write a message to test for success in the ctest-builder
MESSAGE( "ctest_script ran to completion" )

7
cmake/macros.cmake
View File

@@ -450,11 +450,14 @@ MACRO( TEST_EXAMPLE EXAMPLE EXEFILE PROCS ${ARGN} )
${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE}" "${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}"
DEPENDS ${EXEFILE}
)
SET( TESTNAME example--${EXAMPLE} )
ADD_TEST(
NAME example--${EXAMPLE}
NAME ${TESTNAME}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}"
COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} "${LBPM_INSTALL_DIR}/bin/${EXEFILE}" ${ARGN} )
SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES FAIL_REGULAR_EXPRESSION "${TEST_FAIL_REGULAR_EXPRESSION}" PROCESSORS ${PROCS} RESOURCE_LOCK ${EXEFILE} )
SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES FAIL_REGULAR_EXPRESSION "${TEST_FAIL_REGULAR_EXPRESSION}" PROCESSORS ${PROCS} )
SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES RESOURCE_LOCK ${EXEFILE} )
ENDMACRO()

2
common/Communication.h
View File

@@ -1,7 +1,7 @@
#ifndef COMMUNICATION_H_INC
#define COMMUNICATION_H_INC
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include "Array.h"
// ********** COMMUNICTION **************************************

2
common/Domain.h
View File

@@ -13,7 +13,7 @@
#include <stdexcept>
#include "common/Utilities.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include "common/Communication.h"
int MAX_BLOB_COUNT=50;

2
common/MPI.cpp → common/MPI_Helpers.cpp
View File

@@ -1,4 +1,4 @@
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include "common/Utilities.h"

2
common/MPI.h → common/MPI_Helpers.h
View File

@@ -127,6 +127,6 @@ void unpack( std::set<TYPE>& data, const char *buffer );
#endif
#include "common/MPI.hpp"
#include "common/MPI_Helpers.hpp"

2
common/MPI.hpp → common/MPI_Helpers.hpp
View File

@@ -2,7 +2,7 @@
#ifndef MPI_WRAPPERS_HPP
#define MPI_WRAPPERS_HPP
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include <string.h>
#include <vector>
#include <set>

2
cpu/exe/lb2_Color_mpi.cpp
View File

@@ -4,7 +4,7 @@
#include "D3Q19.h"
#include "D3Q7.h"
#include "Color.h"
#include <mpi.h>
#include "common/MPI_Helpers.h"
using namespace std;

4
cpu/exe/lb2_Color_wia_mpi_bubble.cpp
View File

@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <iostream>
#include <fstream>
#include <mpi.h>
#include "pmmc.h"
#include "Domain.h"
@@ -10,9 +10,11 @@
#include "D3Q19.h"
#include "D3Q7.h"
#include "Color.h"
#include "common/MPI_Helpers.h"
using namespace std;
//*************************************************************************
// Implementation of Two-Phase Immiscible LBM using CUDA
//*************************************************************************

2
sample_scripts/configure_blueridge
View File

@@ -11,7 +11,7 @@ cmake \
-D MPI_COMPILER:BOOL=TRUE \
-D MPIEXEC=mpirun \
-D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \
-D CMAKE_BUILD_TYPE:STRING=Debug \
-D CMAKE_BUILD_TYPE:STRING=Release \
-D CUDA_FLAGS="-arch sm_35" \
-D CUDA_HOST_COMPILER="/usr/bin/gcc" \
-D USE_CUDA=0 \

2
tests/BasicSimulator.cpp
View File

@@ -5,7 +5,6 @@
#include <exception>
#include <stdexcept>
#include <fstream>
#include <mpi.h>
#include "pmmc.h"
#include "Domain.h"
@@ -13,6 +12,7 @@
#include "D3Q19.h"
#include "D3Q7.h"
#include "Color.h"
#include "common/MPI_Helpers.h"
#include "Communication.h"
//#define CBUB

3
tests/CMakeLists.txt
View File

@@ -16,7 +16,8 @@ ADD_LBPM_TEST( TestCylinderAreas )
ADD_LBPM_TEST( TestInterfaceSpeed )
ADD_LBPM_TEST( TestSphereCurvature )
ADD_LBPM_TEST( TestContactAngle )
ADD_LBPM_TEST( TestTwoPhase )
ADD_LBPM_TEST_1_2_4( TestTwoPhase )
ADD_LBPM_TEST_PARALLEL( TestTwoPhase 8 )
ADD_LBPM_TEST_1_2_4( testCommunication )
ADD_LBPM_TEST_1_2_4( testUtilities )
ADD_LBPM_TEST( TestWriter )

2
tests/TestBubble.cpp
View File

@@ -11,7 +11,7 @@
#include "D3Q19.h"
#include "D3Q7.h"
#include "Color.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include "Communication.h"
#include "IO/Mesh.h"
#include "IO/Writer.h"

2
tests/TestCommD3Q19.cpp
View File

@@ -10,7 +10,7 @@
#include "D3Q7.h"
#include "Array.h"
#include "Extras.h"
#include <mpi.h>
#include "common/MPI_Helpers.h"
using namespace std;

15
tests/TestTwoPhase.cpp
View File

@@ -12,7 +12,7 @@
#include "D3Q19.h"
#include "D3Q7.h"
#include "Color.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include "Communication.h"
#include "IO/Mesh.h"
#include "IO/Writer.h"
@@ -33,11 +33,20 @@ int main(int argc, char **argv)
int Nx,Ny,Nz;
double Lx,Ly,Lz;
Nx=Ny=Nz=40;
npx=npy=npz=2;
// npz=nprocs;
Lx=Ly=Lz=1.0;
int BC=0; // periodic boundary condition
// Set the number of processors in each direction
if ( nprocs==4 ) {
npx=npy=2;
npz=1;
} else if ( nprocs==8 ) {
npx=npy=npz=2;
} else {
npx=npy=1;
npz=nprocs;
}
Domain Dm(Nx,Ny,Nz,rank,npx,npy,npz,Lx,Ly,Lz,BC);
for (i=0; i<Dm.Nx*Dm.Ny*Dm.Nz; i++) Dm.id[i] = 1;

2
tests/TestWriter.cpp
View File

@@ -8,7 +8,7 @@
#include "common/UnitTest.h"
#include "common/Utilities.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#include "IO/MeshDatabase.h"
#include "IO/Reader.h"
#include "IO/Writer.h"

2
tests/hello_world.cpp
View File

@@ -1,5 +1,5 @@
#include <iostream>
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
int main (int argc, char **argv)

2
tests/lb2_CMT_wia.cpp
View File

@@ -4,7 +4,6 @@
#include <exception>
#include <stdexcept>
#include <fstream>
//#include <mpi.h>
#include "pmmc.h"
#include "Domain.h"
@@ -12,6 +11,7 @@
#include "D3Q19.h"
#include "D3Q7.h"
#include "Color.h"
//#include "common/MPI_Helpers.h"
//#include "Communication.h"
//#define CBUB

2
tests/lb2_Color_blob_wia_mpi.cpp
View File

@@ -5,7 +5,6 @@
#include <exception>
#include <stdexcept>
#include <fstream>
#include <mpi.h>
#include "pmmc.h"
#include "Domain.h"
@@ -13,6 +12,7 @@
#include "D3Q19.h"
#include "D3Q7.h"
#include "Color.h"
#include "common/MPI_Helpers.h"
#include "Communication.h"
#define WRITE_SURFACES

2
tests/lb2_Color_wia_mpi.cpp
View File

@@ -13,7 +13,7 @@
#include "Color.h"
#include "Communication.h"
#include "TwoPhase.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
#define CBUB

2
tests/lbpm_color_simulator.cpp
View File

@@ -13,7 +13,7 @@
#include "Color.h"
#include "Communication.h"
#include "TwoPhase.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
//#define WRITE_SURFACES

2
tests/lbpm_sphere_pp.cpp
View File

@@ -5,11 +5,11 @@
#include <exception>
#include <stdexcept>
#include <fstream>
#include <mpi.h>
#include "pmmc.h"
#include "Domain.h"
#include "Extras.h"
#include "common/MPI_Helpers.h"
#include "Communication.h"
/*

2
tests/testCommunication.cpp
View File

@@ -6,7 +6,7 @@
#include <fstream>
#include "Communication.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
using namespace std;

15
tests/testUtilities.cpp
View File

@@ -10,10 +10,7 @@
#include "common/Utilities.h"
#include "common/UnitTest.h"
#ifdef USE_MPI
#include "mpi.h"
#endif
#include "common/MPI_Helpers.h"
// Function to return the call stack
@@ -30,10 +27,8 @@ std::vector<std::string> get_call_stack()
int main(int argc, char *argv[])
{
int rank = 0;
#ifdef USE_MPI
MPI_Init(&argc,&argv);
MPI_Comm_rank(MPI_COMM_WORLD,&rank);
#endif
MPI_Init(&argc,&argv);
MPI_Comm_rank(MPI_COMM_WORLD,&rank);
UnitTest ut;
Utilities::setAbortBehavior( true, true, true );
@@ -110,9 +105,7 @@ int main(int argc, char *argv[])
size_t N_errors = ut.NumFailGlobal();
if ( N_errors==0 )
printf("All tests passed\n");
#ifdef USE_MPI
MPI_Finalize();
#endif
MPI_Finalize();
return (int) N_errors;
}