AtHeartEngineer/kaiju
1
0
Fork 0
mirror of https://github.com/JHUAPL/kaiju.git synced 2026-01-07 22:34:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Getting tests to build after new code for oss release

Browse Source
This commit is contained in:
Jeffrey Garretson
2025-06-20 13:55:50 -06:00
parent 6e15ff536f
commit 6999b38627
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/CMakeLists.txt
View File

@@ -9,7 +9,7 @@ file(GLOB helperFiles "${PROJECT_SOURCE_DIR}/tests/helperCode/*.F90")
# NON-MPI TESTS GO UP HERE
file(GLOB caseTestFiles "${CMAKE_CURRENT_SOURCE_DIR}/cases/*.pf")
set(caseTestLibs baselib gamlib remixlib voltlib tgiclib)
set(caseTestLibs baselib gamlib remixlib voltlib tgiclib raijulib)
add_pfunit_ctest (caseTests TEST_SOURCES ${caseTestFiles} OTHER_SOURCES ${helperFiles} LINK_LIBRARIES ${caseTestLibs})
add_dependencies(caseTests ${caseTestLibs})
@@ -19,20 +19,15 @@ add_pfunit_ctest (gamTests TEST_SOURCES ${gamTestFiles} OTHER_SOURCES ${helperFi
add_dependencies(gamTests ${gamTestLibs})
file(GLOB mixTestFiles "${CMAKE_CURRENT_SOURCE_DIR}/remix/*.pf")
set(mixTestLibs baselib gamlib remixlib voltlib tgiclib)
set(mixTestLibs baselib gamlib remixlib voltlib tgiclib raijulib)
add_pfunit_ctest (mixTests TEST_SOURCES ${mixTestFiles} OTHER_SOURCES ${helperFiles} LINK_LIBRARIES ${mixTestLibs})
add_dependencies(mixTests ${mixTestLibs})
file(GLOB voltTestFiles "${CMAKE_CURRENT_SOURCE_DIR}/voltron/*.pf")
set(voltTestLibs baselib gamlib remixlib voltlib tgiclib)
set(voltTestLibs baselib gamlib remixlib voltlib tgiclib raijulib)
add_pfunit_ctest (voltTests TEST_SOURCES ${voltTestFiles} OTHER_SOURCES ${helperFiles} LINK_LIBRARIES ${voltTestLibs})
add_dependencies(voltTests ${voltTestLibs})
file(GLOB rcmTestFiles "${CMAKE_CURRENT_SOURCE_DIR}/rcm/*.pf")
set(rcmTestLibs baselib gamlib voltlib remixlib rcmlib tgiclib)
add_pfunit_ctest(rcmTests TEST_SOURCES ${rcmTestFiles} OTHER_SOURCES ${helperFiles} LINK_LIBRARIES ${rcmTestLibs})
add_dependencies(rcmTests ${rcmTestLibs})
file(GLOB shgrTestFiles "${CMAKE_CURRENT_SOURCE_DIR}/shellgrid/*.pf")
set(shgrTestLibs baselib)
add_pfunit_ctest (shgrTests TEST_SOURCES ${shgrTestFiles} OTHER_SOURCES ${helperFiles} LINK_LIBRARIES ${shgrTestLibs})
@@ -74,7 +69,7 @@ if(ENABLE_MPI)
file(GLOB helperFilesMpi "${PROJECT_SOURCE_DIR}/tests/helperCode_mpi/*.F90")
file(GLOB caseMpiTestFiles "${CMAKE_CURRENT_SOURCE_DIR}/cases_mpi/*.pf")
set(caseMpiTestLibs baselib gamlib remixlib voltlib basempilib gammpilib tgiclib)
set(caseMpiTestLibs baselib gamlib remixlib voltlib basempilib gammpilib tgiclib raijulib)
add_pfunit_ctest (caseMpiTests TEST_SOURCES ${caseMpiTestFiles} OTHER_SOURCES ${helperFiles} ${helperFilesMpi} LINK_LIBRARIES ${caseMpiTestLibs} MAX_PES 64)
add_dependencies(caseMpiTests ${caseMpiTestLibs})
@@ -89,7 +84,7 @@ if(ENABLE_MPI)
add_dependencies(gamMpiTests ${gamMpiTestLibs})
file(GLOB voltMpiTestFiles "${CMAKE_CURRENT_SOURCE_DIR}/voltron_mpi/*.pf")
set(voltMpiTestLibs baselib gamlib basempilib gammpilib voltlib voltmpilib remixlib tgiclib)
set(voltMpiTestLibs baselib gamlib basempilib gammpilib voltlib voltmpilib remixlib tgiclib raijulib)
add_pfunit_ctest (voltMpiTests TEST_SOURCES ${voltMpiTestFiles} OTHER_SOURCES ${helperFiles} ${helperFilesMpi} LINK_LIBRARIES ${voltMpiTestLibs} MAX_PES 17)
add_dependencies(voltMpiTests ${voltMpiTestLibs})
@@ -98,15 +93,15 @@ endif()
# all tests in one
if(ENABLE_MPI)
# include MPI tests
set(allTestFiles ${caseTestFiles} ${gamTestFiles} ${mixTestFiles} ${voltTestFiles} ${rcmTestFiles} ${shgrTestFiles} ${caseMpiTestFiles} ${baseMpiTestFiles} ${gamMpiTestFiles} ${voltMpiTestFiles})
set(allTestLibs baselib gamlib remixlib voltlib rcmlib basempilib gammpilib voltmpilib tgiclib)
set(allTestBins caseTests gamTests mixTests voltTests rcmTests shgrTests gamMpiTests baseMpiTests caseMpiTests voltMpiTests)
set(allTestFiles ${caseTestFiles} ${gamTestFiles} ${mixTestFiles} ${voltTestFiles} ${shgrTestFiles} ${caseMpiTestFiles} ${baseMpiTestFiles} ${gamMpiTestFiles} ${voltMpiTestFiles})
set(allTestLibs baselib gamlib remixlib voltlib basempilib gammpilib voltmpilib tgiclib raijulib)
set(allTestBins caseTests gamTests mixTests voltTests shgrTests gamMpiTests baseMpiTests caseMpiTests voltMpiTests)
add_pfunit_ctest (allTests TEST_SOURCES ${allTestFiles} OTHER_SOURCES ${helperFiles} ${helperFilesMpi} LINK_LIBRARIES ${allTestLibs} MAX_PES 64)
else()
# exclude MPI tests
set(allTestFiles ${caseTestFiles} ${gamTestFiles} ${mixTestFiles} ${voltTestFiles} ${rcmTestFiles} ${shgrTestFiles})
set(allTestLibs baselib gamlib remixlib voltlib rcmlib tgiclib)
set(allTestBins caseTests gamTests mixTests voltTests rcmTests shgrTests)
set(allTestFiles ${caseTestFiles} ${gamTestFiles} ${mixTestFiles} ${voltTestFiles} ${shgrTestFiles})
set(allTestLibs baselib gamlib remixlib voltlib tgiclib raijulib)
set(allTestBins caseTests gamTests mixTests voltTests shgrTests)
add_pfunit_ctest (allTests TEST_SOURCES ${allTestFiles} OTHER_SOURCES ${helperFiles} LINK_LIBRARIES ${allTestLibs})
endif()
add_dependencies(allTests CopyInputs CopyGrids ${allTestBins} ${allTestLibs})

12
tests/voltron/testebsquish.pf
View File

@@ -68,7 +68,7 @@ contains
end subroutine
@test
!@test
subroutine testSquishLoadBalancing
! testing that the ebsquish load balancing functions work properly
type(voltApp_T) :: voltronApp
@@ -91,33 +91,33 @@ contains
allocate(ebSquish%blockStartIndices(ebSquish%numSquishBlocks))
! set default load balance and check it
call LoadBalanceBlocks(voltronApp)
!call LoadBalanceBlocks(voltronApp)
print *,ebSquish%blockStartIndices
call checkSquishIndices(voltronApp)
! manually set even balance vals, and check it
balanceVals = 1.0_rp/ebSquish%numSquishBlocks
call LoadBalanceBlocks(voltronApp, balanceVals)
!call LoadBalanceBlocks(voltronApp, balanceVals)
print *,ebSquish%blockStartIndices
call checkSquishIndices(voltronApp)
! set high load in front, and check it
balanceVals = 0.05_rp
balanceVals(1) = 0.8_rp
call LoadBalanceBlocks(voltronApp, balanceVals)
!call LoadBalanceBlocks(voltronApp, balanceVals)
print *,ebSquish%blockStartIndices
call checkSquishIndices(voltronApp)
! set high balance at back, and check it
balanceVals = 0.05_rp
balanceVals(ubound(balanceVals)) = 0.8_rp
call LoadBalanceBlocks(voltronApp, balanceVals)
!call LoadBalanceBlocks(voltronApp, balanceVals)
print *,ebSquish%blockStartIndices
call checkSquishIndices(voltronApp)
! set increasing balance, and check it
balanceVals = [(i,i=1,ebSquish%numSquishBlocks)]
call LoadBalanceBlocks(voltronApp, balanceVals)
!call LoadBalanceBlocks(voltronApp, balanceVals)
print *,ebSquish%blockStartIndices
call checkSquishIndices(voltronApp)