Skip to content

Commit

Permalink
Merge pull request #23 from Wendi-L/master
Browse files Browse the repository at this point in the history 
Update wrapper demos for MUI v2.0
  • Loading branch information
@SLongshaw
SLongshaw committed Oct 30, 2023
2 parents b2ebbb4 + cecf8de commit ecd9b7f
Show file tree
Hide file tree
Showing 32 changed files with 82 additions and 207 deletions.
7 changes: 2 additions & 5 deletions 10-wrappers/10-0-C/10-0-0-simple/CMakeLists.txt
View file
Expand Up @@ -13,11 +13,8 @@ include_directories(${MPI_INCLUDE_PATH})
find_package(MUI QUIET)

if(MUI_BASE_DIR)
set(MUI_C_LIB_DIR "${MUI_LIB_DIR}")
set(MUI_C_INCLUDE_DIR "${MUI_INCLUDE_DIR}/wrappers/C")
elseif(MUI_BASE_C_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_C_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_C_DIR}/include/wrappers/C")
set(MUI_C_LIB_DIR "${MUI_BASE_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_DIR}/include/wrappers/C")
endif()

find_library(MUI_C_WRAPPER_LIB NAMES MUI_C_wrapper PATHS ${MUI_C_LIB_DIR})
Expand Down
2 changes: 1 addition & 1 deletion 10-wrappers/10-0-C/10-0-0-simple/run_case.sh
View file
Expand Up @@ -13,7 +13,7 @@ if [ -n "$1" ]; then
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2
else
# Run cmake with the provided path as the MUI base directory
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DCMAKE_PREFIX_PATH=$1
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_BASE_DIR=$1
fi
else
# Run cmake with the default MUI directory
Expand Down
7 changes: 2 additions & 5 deletions 10-wrappers/10-0-C/10-0-1-multiple-interfaces/CMakeLists.txt
View file
Expand Up @@ -13,11 +13,8 @@ include_directories(${MPI_INCLUDE_PATH})
find_package(MUI QUIET)

if(MUI_BASE_DIR)
set(MUI_C_LIB_DIR "${MUI_LIB_DIR}")
set(MUI_C_INCLUDE_DIR "${MUI_INCLUDE_DIR}/wrappers/C")
elseif(MUI_BASE_C_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_C_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_C_DIR}/include/wrappers/C")
set(MUI_C_LIB_DIR "${MUI_BASE_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_DIR}/include/wrappers/C")
endif()

find_library(MUI_C_WRAPPER_LIB NAMES MUI_C_wrapper PATHS ${MUI_C_LIB_DIR})
Expand Down
2 changes: 1 addition & 1 deletion 10-wrappers/10-0-C/10-0-1-multiple-interfaces/run_case.sh
View file
Expand Up @@ -13,7 +13,7 @@ if [ -n "$1" ]; then
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2
else
# Run cmake with the provided path as the MUI base directory
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DCMAKE_PREFIX_PATH=$1
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_BASE_DIR=$1
fi
else
# Run cmake with the default MUI directory
Expand Down
7 changes: 2 additions & 5 deletions 10-wrappers/10-0-C/10-0-2-smart-send-dual-times/CMakeLists.txt
View file
Expand Up @@ -15,11 +15,8 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_LINK_FLAGS}")
find_package(MUI QUIET)

if(MUI_BASE_DIR)
set(MUI_C_LIB_DIR "${MUI_LIB_DIR}")
set(MUI_C_INCLUDE_DIR "${MUI_INCLUDE_DIR}/wrappers/C")
elseif(MUI_BASE_C_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_C_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_C_DIR}/include/wrappers/C")
set(MUI_C_LIB_DIR "${MUI_BASE_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_DIR}/include/wrappers/C")
endif()

find_library(MUI_C_WRAPPER_LIB NAMES MUI_C_wrapper PATHS ${MUI_C_LIB_DIR})
Expand Down
2 changes: 1 addition & 1 deletion 10-wrappers/10-0-C/10-0-2-smart-send-dual-times/run_case.sh
View file
Expand Up @@ -13,7 +13,7 @@ if [ -n "$1" ]; then
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2
else
# Run cmake with the provided path as the MUI base directory
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DCMAKE_PREFIX_PATH=$1
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_BASE_DIR=$1
fi
else
# Run cmake with the default MUI directory
Expand Down
5 changes: 2 additions & 3 deletions 10-wrappers/10-0-C/10-0-3-pseudo-diffusion/3D-pseudo-diffusion-coarse.c
View file
Expand Up @@ -77,7 +77,6 @@ int main(int argc, char **argv) {
/// Create rbf matrix folder
char makedirMString[32];
sprintf(makedirMString, "rbfCoarseMatrix%d", mui_ranks);
mkdir(makedirMString, 0777);

/// Define the name of MUI domain
char *domain = (char*) malloc(strlen("coarseDomain") + 1);
Expand Down Expand Up @@ -124,7 +123,7 @@ int main(int argc, char **argv) {
int conservative = 1;
double cutoff = 1e-9;
int smoothFunc = 0;
int writeMatrix = 1;
int generateMatrix = 1;
double cgSolveTol = 1e-6;
int cgMaxIter = 500;
int preconditioner= 1;
Expand Down Expand Up @@ -248,7 +247,7 @@ int main(int argc, char **argv) {

/// Define spatial and temporal samplers
mui_sampler_rbf_2d *spatial_sampler2d = mui_create_sampler_rbf_2d(rSampler, point2d, point_count, basisFunc, conservative,
smoothFunc, writeMatrix, fileAddress, cutoff, cgSolveTol, cgMaxIter, pouSize, preconditioner, MUI_COMM_WORLD);
smoothFunc, generateMatrix, fileAddress, cutoff, cgSolveTol, cgMaxIter, pouSize, preconditioner, MUI_COMM_WORLD);
mui_temporal_sampler_exact_2d *temporal_sampler2d = mui_create_temporal_sampler_exact_2d(8e-1);

/// Commit ZERO step of MUI
Expand Down
5 changes: 2 additions & 3 deletions 10-wrappers/10-0-C/10-0-3-pseudo-diffusion/3D-pseudo-diffusion-fine.cpp
View file
Expand Up @@ -76,7 +76,6 @@ int main(int argc, char ** argv) {

/// Create rbf matrix folder
std::string makedirMString = "rbfFineMatrix" + std::to_string(rank);
mkdir(makedirMString.c_str(), 0777);

/// Define the name of MUI domain
std::string domain = "fineDomain";
Expand All @@ -103,7 +102,7 @@ int main(int argc, char ** argv) {
bool conservative = true;
double cutoff = 1e-9;
bool smoothFunc = false;
bool writeMatrix = true;
bool generateMatrix = true;
double cgSolveTol = 1e-6;
int cgMaxIter = 500;
int preconditioner= 1;
Expand Down Expand Up @@ -279,7 +278,7 @@ int main(int argc, char ** argv) {

/// Define spatial and temporal samplers
mui::sampler_rbf2d<double> spatial_sampler(rSampler, point2dvec,
basisFunc, conservative, smoothFunc, writeMatrix, fileAddress,
basisFunc, conservative, smoothFunc, generateMatrix, fileAddress,
cutoff, cgSolveTol, cgMaxIter, pouSize, preconditioner, world);
mui::temporal_sampler_exact2d temporal_sampler;

Expand Down
26 changes: 6 additions & 20 deletions 10-wrappers/10-0-C/10-0-3-pseudo-diffusion/CMakeLists.txt
View file
Expand Up @@ -10,33 +10,19 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

set(MUI_C_CPP_SEPERATE_PATH 0)

find_package(MPI REQUIRED)
include_directories(${MPI_INCLUDE_PATH})

find_package(MUI REQUIRED)

if(DEFINED MUI_C_CPP_SEPERATE_PATH AND ${MUI_C_CPP_SEPERATE_PATH} EQUAL 1)
if(MUI_BASE_DIR)
include_directories(${MUI_INCLUDE_DIR})
elseif(MUI_BASE_C_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_C_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_C_DIR}/include/wrappers/C")
include_directories(${MUI_BASE_C_DIR})
endif()
else()
if(MUI_BASE_DIR)
set(MUI_C_LIB_DIR "${MUI_LIB_DIR}")
set(MUI_C_INCLUDE_DIR "${MUI_INCLUDE_DIR}/wrappers/C")
include_directories(${MUI_INCLUDE_DIR})
elseif(MUI_BASE_C_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_C_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_C_DIR}/include/wrappers/C")
include_directories(${MUI_BASE_C_DIR})
endif()
if(MUI_BASE_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_DIR}/include/wrappers/C")
set(MUI_INCLUDE_DIR "${MUI_BASE_DIR}/include")
include_directories(${MUI_INCLUDE_DIR})
endif()


set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_COMPILE_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_LINK_FLAGS}")

Expand Down
4 changes: 2 additions & 2 deletions 10-wrappers/10-0-C/10-0-3-pseudo-diffusion/run_case.sh
View file
Expand Up @@ -11,14 +11,14 @@ if [ -n "$1" ]; then
if [ -n "$2" ]; then
if [ -n "$3" ]; then
# Run cmake with the provided path as the MUI include and lib directories
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2 -DCMAKE_PREFIX_PATH=$3 $4
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2 -DCMAKE_PREFIX_PATH=$3
else
# Run cmake with the provided path as the MUI include and lib directories
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2
fi
else
# Run cmake with the provided path as the MUI base directory
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DCMAKE_PREFIX_PATH=$1
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_BASE_DIR=$1 -DCMAKE_PREFIX_PATH=$1/share/MUI-2.0/cmake
fi
else
# Run cmake with the default MUI directory
Expand Down
24 changes: 4 additions & 20 deletions 10-wrappers/10-0-C/10-0-4-basic-fixed-relaxation/CMakeLists.txt
View file
Expand Up @@ -10,31 +10,15 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

set(MUI_C_CPP_SEPERATE_PATH 0)

find_package(MPI REQUIRED)
include_directories(${MPI_INCLUDE_PATH})

find_package(MUI REQUIRED)

if(${MUI_C_CPP_SEPERATE_PATH} EQUAL 1)
if(MUI_BASE_DIR)
include_directories(${MUI_INCLUDE_DIR})
elseif(MUI_BASE_C_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_C_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_C_DIR}/include/wrappers/C")
include_directories(${MUI_BASE_C_DIR})
endif()
else()
if(MUI_BASE_DIR)
set(MUI_C_LIB_DIR "${MUI_LIB_DIR}")
set(MUI_C_INCLUDE_DIR "${MUI_INCLUDE_DIR}/wrappers/C")
include_directories(${MUI_INCLUDE_DIR})
elseif(MUI_BASE_C_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_C_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_C_DIR}/include/wrappers/C")
include_directories(${MUI_BASE_C_DIR})
endif()
if(MUI_BASE_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_DIR}/include/wrappers/C")
include_directories(${MUI_INCLUDE_DIR})
endif()

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_COMPILE_FLAGS}")
Expand Down
4 changes: 2 additions & 2 deletions 10-wrappers/10-0-C/10-0-4-basic-fixed-relaxation/run_case.sh
View file
Expand Up @@ -11,14 +11,14 @@ if [ -n "$1" ]; then
if [ -n "$2" ]; then
if [ -n "$3" ]; then
# Run cmake with the provided path as the MUI include and lib directories
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2 -DCMAKE_PREFIX_PATH=$3 $4
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2 -DCMAKE_PREFIX_PATH=$3
else
# Run cmake with the provided path as the MUI include and lib directories
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2
fi
else
# Run cmake with the provided path as the MUI base directory
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DCMAKE_PREFIX_PATH=$1
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_BASE_DIR=$1 -DCMAKE_PREFIX_PATH=$1/share/MUI-2.0/cmake
fi
else
# Run cmake with the default MUI directory
Expand Down
24 changes: 4 additions & 20 deletions 10-wrappers/10-0-C/10-0-5-dynamic-points-aitken/CMakeLists.txt
View file
Expand Up @@ -10,31 +10,15 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

set(MUI_C_CPP_SEPERATE_PATH 0)

find_package(MPI REQUIRED)
include_directories(${MPI_INCLUDE_PATH})

find_package(MUI REQUIRED)

if(${MUI_C_CPP_SEPERATE_PATH} EQUAL 1)
if(MUI_BASE_DIR)
include_directories(${MUI_INCLUDE_DIR})
elseif(MUI_BASE_C_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_C_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_C_DIR}/include/wrappers/C")
include_directories(${MUI_BASE_C_DIR})
endif()
else()
if(MUI_BASE_DIR)
set(MUI_C_LIB_DIR "${MUI_LIB_DIR}")
set(MUI_C_INCLUDE_DIR "${MUI_INCLUDE_DIR}/wrappers/C")
include_directories(${MUI_INCLUDE_DIR})
elseif(MUI_BASE_C_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_C_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_C_DIR}/include/wrappers/C")
include_directories(${MUI_BASE_C_DIR})
endif()
if(MUI_BASE_DIR)
set(MUI_C_LIB_DIR "${MUI_BASE_DIR}/lib")
set(MUI_C_INCLUDE_DIR "${MUI_BASE_DIR}/include/wrappers/C")
include_directories(${MUI_INCLUDE_DIR})
endif()

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_COMPILE_FLAGS}")
Expand Down
4 changes: 2 additions & 2 deletions 10-wrappers/10-0-C/10-0-5-dynamic-points-aitken/run_case.sh
View file
Expand Up @@ -11,14 +11,14 @@ if [ -n "$1" ]; then
if [ -n "$2" ]; then
if [ -n "$3" ]; then
# Run cmake with the provided path as the MUI include and lib directories
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2 -DCMAKE_PREFIX_PATH=$3 $4
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2 -DCMAKE_PREFIX_PATH=$3
else
# Run cmake with the provided path as the MUI include and lib directories
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_C_INCLUDE_DIR=$1 -DMUI_C_LIB_DIR=$2
fi
else
# Run cmake with the provided path as the MUI base directory
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DCMAKE_PREFIX_PATH=$1
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_BASE_DIR=$1 -DCMAKE_PREFIX_PATH=$1/share/MUI-2.0/cmake
fi
else
# Run cmake with the default MUI directory
Expand Down
10 changes: 3 additions & 7 deletions 10-wrappers/10-1-Fortran/10-1-0-simple/CMakeLists.txt
View file
Expand Up @@ -14,15 +14,11 @@ include_directories(${MPI_INCLUDE_PATH})
find_package(MUI QUIET)

if(MUI_BASE_DIR)
set(MUI_FORTRAN_LIB_DIR "${MUI_LIB_DIR}")
set(MUI_FORTRAN_LIB_DIR "${MUI_BASE_DIR}/lib")
# Add the include directories
include_directories(${MUI_LIB_DIR}/mod)
set(MUI_FORTRAN_INCLUDE_DIR "${MUI_INCLUDE_DIR}/wrappers/Fortran")
include_directories(${MUI_BASE_DIR}/lib/mod)
set(MUI_FORTRAN_INCLUDE_DIR "${MUI_BASE_DIR}/include/wrappers/Fortran")
include_directories(${MUI_INCLUDE_DIR})
elseif(MUI_BASE_FORTRAN_DIR)
set(MUI_FORTRAN_LIB_DIR "${MUI_BASE_FORTRAN_DIR}/lib")
set(MUI_FORTRAN_INCLUDE_DIR "${MUI_BASE_FORTRAN_DIR}/include/wrappers/Fortran")
include_directories(${MUI_BASE_FORTRAN_DIR})
endif()

find_library(MUI_FORTRAN_WRAPPER_LIB NAMES MUI_Fortran_wrapper PATHS ${MUI_FORTRAN_LIB_DIR})
Expand Down
2 changes: 1 addition & 1 deletion 10-wrappers/10-1-Fortran/10-1-0-simple/run_case.sh
View file
Expand Up @@ -13,7 +13,7 @@ if [ -n "$1" ]; then
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_FORTRAN_INCLUDE_DIR=$1 -DMUI_FORTRAN_LIB_DIR=$2
else
# Run cmake with the provided path as the MUI base directory
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DCMAKE_PREFIX_PATH=$1
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_BASE_DIR=$1
fi
else
# Run cmake with the default MUI directory
Expand Down
9 changes: 3 additions & 6 deletions 10-wrappers/10-1-Fortran/10-1-1-multiple-interfaces/CMakeLists.txt
View file
Expand Up @@ -14,14 +14,11 @@ include_directories(${MPI_INCLUDE_PATH})
find_package(MUI QUIET)

if(MUI_BASE_DIR)
set(MUI_FORTRAN_LIB_DIR "${MUI_LIB_DIR}")
set(MUI_FORTRAN_LIB_DIR "${MUI_BASE_DIR}/lib")
# Add the include directories
include_directories(${MUI_LIB_DIR}/mod)
set(MUI_FORTRAN_INCLUDE_DIR "${MUI_INCLUDE_DIR}/wrappers/Fortran")
include_directories(${MUI_BASE_DIR}/lib/mod)
set(MUI_FORTRAN_INCLUDE_DIR "${MUI_BASE_DIR}/include/wrappers/Fortran")
include_directories(${MUI_INCLUDE_DIR})
elseif(MUI_BASE_FORTRAN_DIR)
set(MUI_FORTRAN_LIB_DIR "${MUI_BASE_FORTRAN_DIR}/lib")
set(MUI_FORTRAN_INCLUDE_DIR "${MUI_BASE_FORTRAN_DIR}/include/wrappers/Fortran")
endif()

find_library(MUI_FORTRAN_WRAPPER_LIB NAMES MUI_Fortran_wrapper PATHS ${MUI_FORTRAN_LIB_DIR})
Expand Down
2 changes: 1 addition & 1 deletion 10-wrappers/10-1-Fortran/10-1-1-multiple-interfaces/run_case.sh
View file
Expand Up @@ -13,7 +13,7 @@ if [ -n "$1" ]; then
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_FORTRAN_INCLUDE_DIR=$1 -DMUI_FORTRAN_LIB_DIR=$2
else
# Run cmake with the provided path as the MUI base directory
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DCMAKE_PREFIX_PATH=$1
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_BASE_DIR=$1
fi
else
# Run cmake with the default MUI directory
Expand Down
9 changes: 3 additions & 6 deletions 10-wrappers/10-1-Fortran/10-1-2-smart-send-dual-times/CMakeLists.txt
View file
Expand Up @@ -17,14 +17,11 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_LINK_FLAGS}")
find_package(MUI QUIET)

if(MUI_BASE_DIR)
set(MUI_FORTRAN_LIB_DIR "${MUI_LIB_DIR}")
set(MUI_FORTRAN_LIB_DIR "${MUI_BASE_DIR}/lib")
# Add the include directories
include_directories(${MUI_LIB_DIR}/mod)
set(MUI_FORTRAN_INCLUDE_DIR "${MUI_INCLUDE_DIR}/wrappers/Fortran")
include_directories(${MUI_BASE_DIR}/lib/mod)
set(MUI_FORTRAN_INCLUDE_DIR "${MUI_BASE_DIR}/include/wrappers/Fortran")
include_directories(${MUI_INCLUDE_DIR})
elseif(MUI_BASE_FORTRAN_DIR)
set(MUI_FORTRAN_LIB_DIR "${MUI_BASE_FORTRAN_DIR}/lib")
set(MUI_FORTRAN_INCLUDE_DIR "${MUI_BASE_FORTRAN_DIR}/include/wrappers/Fortran")
endif()

find_library(MUI_FORTRAN_WRAPPER_LIB NAMES MUI_Fortran_wrapper PATHS ${MUI_FORTRAN_LIB_DIR})
Expand Down
2 changes: 1 addition & 1 deletion 10-wrappers/10-1-Fortran/10-1-2-smart-send-dual-times/run_case.sh
View file
Expand Up @@ -13,7 +13,7 @@ if [ -n "$1" ]; then
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_FORTRAN_INCLUDE_DIR=$1 -DMUI_FORTRAN_LIB_DIR=$2
else
# Run cmake with the provided path as the MUI base directory
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DCMAKE_PREFIX_PATH=$1
cmake -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=../ .. -DMUI_BASE_DIR=$1
fi
else
# Run cmake with the default MUI directory
Expand Down
7 changes: 3 additions & 4 deletions 10-wrappers/10-1-Fortran/10-1-3-pseudo-diffusion/3D-pseudo-diffusion-coarse.f90
View file
Expand Up @@ -59,7 +59,7 @@ program main
integer(c_int) :: basisFunc = 1
integer(c_int) :: conservative = 1
integer(c_int) :: smoothFunc = 0
integer(c_int) :: writeMatrix = 1
integer(c_int) :: generateMatrix = 1
integer(c_int) :: cgMaxIter = 500
integer(c_int) :: preconditioner = 1
integer(c_int) :: pouSize = 50
Expand Down Expand Up @@ -164,9 +164,8 @@ program main

tolerance = (lx / (Nx - 1)) * 0.5

! Create rbf matrix folder
! Define rbf matrix folder
write(makedirMString,'(a,i0)') "rbfCoarseMatrix", mui_ranks
call system('mkdir -m 777 '//trim(makedirMString), ierr)
fileAddress = TRIM(makedirMString)

! Check if directory was created successfully
Expand Down Expand Up @@ -242,7 +241,7 @@ program main
!Create spatial and temporal samplers for fetch operation
call mui_create_sampler_rbf_2d_f(spatial_sampler_rbf_2d,rSampler,point2dY,point2dZ, &
point_count,basisFunc,conservative,smoothFunc, &
writeMatrix,TRIM(makedirMString),cutoff,cgSolveTol, &
generateMatrix,TRIM(makedirMString),cutoff,cgSolveTol, &
cgMaxIter,pouSize,preconditioner,MUI_COMM_WORLD)
call mui_create_temporal_sampler_exact_2d_f(temporal_sampler_exact_2d, tolerance_sampler)

Expand Down

0 comments on commit ecd9b7f

Please sign in to comment.