Skip to content

Commit bc002bd

Browse files
Sichao25Sichao25
authored
Merge branch 'develop' into yus/reformat
2 parents 49f8408 + bcb4fc4 commit bc002bd

File tree

3 files changed

+44
-87
lines changed

3 files changed

+44
-87
lines changed

‎.github/workflows/update_doxygen_page.yml‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,35 @@ name: Update Doxygen Page
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches:
6+
- develop
77

88
jobs:
99
doxygen:
1010
runs-on: ubuntu-latest
1111
permissions:
12-
contents: write
12+
contents: read
13+
pages: write
14+
id-token: write
1315

1416
steps:
1517

1618
- name: Install Doxygen
1719
run: |
18-
sudo apt-add-repository universe
1920
sudo apt-get update
2021
sudo apt-get install doxygen
2122
2223
- name: Checkout Original
2324
uses: actions/checkout@v4
24-
with:
25-
path: original
2625

2726
- name: Run Doxygen
28-
working-directory: original
2927
run: doxygen
3028

31-
- name: Checkout Pages
32-
uses: actions/checkout@v4
29+
- name: Upload artifact
30+
uses: actions/upload-pages-artifact@v3
3331
with:
34-
path: pages
32+
path: ./html
3533

36-
- name: Set up pages directory
37-
working-directory: pages
38-
run: |
39-
git checkout --orphan gh-pages
40-
git rm -rf .
41-
cp -r ../original/html/. .
42-
- name: Update Github
43-
working-directory: pages
44-
run: |
45-
git config user.name "GitHub Actions Bot"
46-
git config user.email "<>"
47-
git add .
48-
git commit -m "Update page from action"
49-
git push -f origin gh-pages
34+
- name: Deploy to GitHub Pages
35+
id: deployment
36+
uses: actions/deploy-pages@v4

‎src/pcms/uniform_grid.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct UniformGrid
4343
for (int i = 0; i < dim; ++i) {
4444
auto index = static_cast<LO>(
4545
std::floor(distance_within_grid[i] * divisions[i] / edge_length[i]));
46-
indexes[i] = std::clamp(index, 0, divisions[i] - 1);
46+
indexes[i] = Kokkos::clamp(index, 0, divisions[i] - 1);
4747
}
4848
// note that the indexes refer to row/columns which have the opposite order
4949
// of the coordinates i.e. x,y

‎test/CMakeLists.txt‎

Lines changed: 32 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -363,68 +363,38 @@ else()
363363
message(WARNING "Catch2 not found. Disabling Unit Tests")
364364
endif()
365365

366-
if(PCMS_ENABLE_C)
367-
find_package(Kokkos REQUIRED)
368-
if(PCMS_ENABLE_XGC)
369-
add_executable(test_proxy_couple_xgc_c_interface
370-
test_proxy_coupling_xgc_client.c)
371-
target_link_libraries(test_proxy_couple_xgc_c_interface
372-
PUBLIC pcms::capi MPI::MPI_C Kokkos::kokkos)
373-
if(PCMS_ENABLE_OMEGA_H)
374-
add_executable(test_proxy_couple_xgc_cpp_interface
375-
test_proxy_coupling_xgc_server.cpp)
376-
target_link_libraries(test_proxy_couple_xgc_cpp_interface
377-
PUBLIC pcms::core MPI::MPI_C test_support)
378-
if(HOST_NPROC GREATER_EQUAL 3)
379-
dual_mpi_test(
380-
TESTNAME
381-
xgc_proxy_to_xgc
382-
TIMEOUT
383-
10
384-
NAME1
385-
cinterface
386-
EXE1
387-
$<TARGET_FILE:test_proxy_couple_xgc_c_interface>
388-
PROCS1
389-
2
390-
ARGS1
391-
${PCMS_TEST_DATA_DIR}/d3d/meshRclassification.txt
392-
NAME2
393-
cppinterface
394-
EXE2
395-
$<TARGET_FILE:test_proxy_couple_xgc_cpp_interface>
396-
PROCS2
397-
1
398-
ARGS2
399-
${d3d1p}
400-
${d3d1p_cpn}
401-
0)
402-
endif()
403-
if(HOST_NPROC GREATER_EQUAL 6)
404-
dual_mpi_test(
405-
TESTNAME
406-
xgc_proxy_to_omega
407-
TIMEOUT
408-
10
409-
NAME1
410-
cinterface
411-
EXE1
412-
$<TARGET_FILE:test_proxy_couple_xgc_c_interface>
413-
PROCS1
414-
4
415-
ARGS1
416-
${PCMS_TEST_DATA_DIR}/d3d/meshRclassification.txt
417-
NAME2
418-
cppinterface
419-
EXE2
420-
$<TARGET_FILE:test_proxy_couple_xgc_cpp_interface>
421-
PROCS2
422-
2
423-
ARGS2
424-
${d3d1p}
425-
${d3d2p_cpn}
426-
1)
427-
endif()
366+
if (PCMS_ENABLE_C)
367+
find_package(Kokkos REQUIRED)
368+
if (PCMS_ENABLE_XGC)
369+
add_executable(test_proxy_couple_xgc_c_interface test_proxy_coupling_xgc_client.c)
370+
target_link_libraries(test_proxy_couple_xgc_c_interface PUBLIC pcms::capi MPI::MPI_C Kokkos::kokkos)
371+
if (PCMS_ENABLE_OMEGA_H)
372+
add_executable(test_proxy_couple_xgc_cpp_interface test_proxy_coupling_xgc_server.cpp)
373+
target_link_libraries(test_proxy_couple_xgc_cpp_interface PUBLIC pcms::core MPI::MPI_C test_support)
374+
if(HOST_NPROC GREATER_EQUAL 3)
375+
dual_mpi_test(TESTNAME xgc_proxy_to_xgc
376+
TIMEOUT 10
377+
NAME1 cinterface EXE1 $<TARGET_FILE:test_proxy_couple_xgc_c_interface> PROCS1 2 ARGS1 ${PCMS_TEST_DATA_DIR}/d3d/meshRclassification.txt
378+
NAME2 cppinterface EXE2 $<TARGET_FILE:test_proxy_couple_xgc_cpp_interface> PROCS2 1 ARGS2 ${d3d1p} ${d3d1p_cpn} 0)
379+
endif()
380+
if(HOST_NPROC GREATER_EQUAL 6)
381+
dual_mpi_test(TESTNAME xgc_proxy_to_omega
382+
TIMEOUT 10
383+
NAME1 cinterface EXE1 $<TARGET_FILE:test_proxy_couple_xgc_c_interface> PROCS1 4 ARGS1 ${PCMS_TEST_DATA_DIR}/d3d/meshRclassification.txt
384+
NAME2 cppinterface EXE2 $<TARGET_FILE:test_proxy_couple_xgc_cpp_interface> PROCS2 2 ARGS2 ${d3d1p} ${d3d2p_cpn} 1)
385+
endif()
386+
endif ()
387+
endif ()
388+
endif ()
389+
if(PCMS_ENABLE_Fortran)
390+
add_executable(test_proxy_coupling_xgc_client_fortran test_proxy_coupling_xgc_client_fortran.f90)
391+
target_link_libraries(test_proxy_coupling_xgc_client_fortran PUBLIC pcms::fortranapi MPI::MPI_Fortran)
392+
set_target_properties(test_proxy_coupling_xgc_client_fortran PROPERTIES LINKER_LANGUAGE Fortran)
393+
if(HOST_NPROC GREATER_EQUAL 4)
394+
dual_mpi_test(TESTNAME xgc_fortran_proxy_to_omega
395+
TIMEOUT 10
396+
NAME1 finterface EXE1 $<TARGET_FILE:test_proxy_coupling_xgc_client_fortran> PROCS1 2 ARGS1 ${PCMS_TEST_DATA_DIR}/d3d/meshRclassification.txt
397+
NAME2 cppinterface EXE2 $<TARGET_FILE:test_proxy_couple_xgc_cpp_interface> PROCS2 2 ARGS2 ${d3d1p} ${d3d2p_cpn} 1)
428398
endif()
429399
endif()
430400
endif()

0 commit comments

Comments
 (0)