Start SPHLite 0.2.0 water test scaffold
This commit is contained in:
+49
-1
@@ -1,6 +1,6 @@
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
|
||||
project(SPHLite VERSION 0.1.1 LANGUAGES C CXX Fortran)
|
||||
project(SPHLite VERSION 0.2.0 LANGUAGES C CXX Fortran)
|
||||
|
||||
set(CMAKE_C_STANDARD 99)
|
||||
set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||
@@ -149,6 +149,54 @@ set_target_properties(test_coupling_interface PROPERTIES Fortran_MODULE_DIRECTOR
|
||||
add_test(NAME coupling_interface COMMAND test_coupling_interface)
|
||||
set_tests_properties(coupling_interface PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
add_executable(test_kernel tests/unit/test_kernel.f90)
|
||||
target_link_libraries(test_kernel PRIVATE sphlite_core)
|
||||
set_target_properties(test_kernel PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
|
||||
add_test(NAME kernel COMMAND test_kernel)
|
||||
set_tests_properties(kernel PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
add_executable(test_neighbor tests/unit/test_neighbor.f90)
|
||||
target_link_libraries(test_neighbor PRIVATE sphlite_core)
|
||||
set_target_properties(test_neighbor PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
|
||||
add_test(NAME neighbor COMMAND test_neighbor)
|
||||
set_tests_properties(neighbor PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
add_executable(test_water_eos tests/module/test_water_eos.f90)
|
||||
target_link_libraries(test_water_eos PRIVATE sphlite_core)
|
||||
set_target_properties(test_water_eos PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
|
||||
add_test(NAME water_eos COMMAND test_water_eos)
|
||||
set_tests_properties(water_eos PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
add_executable(test_water_density tests/module/test_water_density.f90)
|
||||
target_link_libraries(test_water_density PRIVATE sphlite_core)
|
||||
set_target_properties(test_water_density PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
|
||||
add_test(NAME water_density COMMAND test_water_density)
|
||||
set_tests_properties(water_density PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
add_executable(test_water_viscosity tests/module/test_water_viscosity.f90)
|
||||
target_link_libraries(test_water_viscosity PRIVATE sphlite_core)
|
||||
set_target_properties(test_water_viscosity PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
|
||||
add_test(NAME water_viscosity COMMAND test_water_viscosity)
|
||||
set_tests_properties(water_viscosity PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
add_executable(test_water_force tests/module/test_water_force.f90)
|
||||
target_link_libraries(test_water_force PRIVATE sphlite_core)
|
||||
set_target_properties(test_water_force PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
|
||||
add_test(NAME water_force COMMAND test_water_force)
|
||||
set_tests_properties(water_force PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
add_executable(test_solver_water tests/module/test_solver_water.f90)
|
||||
target_link_libraries(test_solver_water PRIVATE sphlite_core)
|
||||
set_target_properties(test_solver_water PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
|
||||
add_test(NAME solver_water COMMAND test_solver_water)
|
||||
set_tests_properties(solver_water PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
add_executable(test_pressure_wave_smoke tests/module/test_pressure_wave_smoke.f90)
|
||||
target_link_libraries(test_pressure_wave_smoke PRIVATE sphlite_core)
|
||||
set_target_properties(test_pressure_wave_smoke PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
|
||||
add_test(NAME pressure_wave_smoke COMMAND test_pressure_wave_smoke)
|
||||
set_tests_properties(pressure_wave_smoke PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
find_package(Python3 REQUIRED COMPONENTS Interpreter)
|
||||
add_test(
|
||||
NAME python_debug
|
||||
|
||||
@@ -3,8 +3,8 @@ module sph_precision
|
||||
|
||||
integer, parameter :: rk = selected_real_kind(12, 100)
|
||||
integer, parameter :: SPH_VERSION_MAJOR = 0
|
||||
integer, parameter :: SPH_VERSION_MINOR = 1
|
||||
integer, parameter :: SPH_VERSION_PATCH = 1
|
||||
integer, parameter :: SPH_VERSION_MINOR = 2
|
||||
integer, parameter :: SPH_VERSION_PATCH = 0
|
||||
integer, parameter :: SPH_NDIM = 3
|
||||
integer, parameter :: SPH_ERROR_MESSAGE_LEN = 256
|
||||
integer, parameter :: SPH_PATH_LEN = 1024
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
*NODE
|
||||
1, 0.0, 0.0, 0.0
|
||||
2, 0.1, 0.0, 0.0
|
||||
3, 0.0, 0.1, 0.0
|
||||
4, 0.0, 0.0, 0.1
|
||||
*ELEMENT, TYPE=SPH3D
|
||||
1, 1
|
||||
2, 2
|
||||
3, 3
|
||||
4, 4
|
||||
*ELSET, ELSET=WATER_PARTICLES
|
||||
1, 2, 3, 4
|
||||
*MATERIAL, NAME=WATER, TYPE=WATER
|
||||
*DENSITY
|
||||
1000.0
|
||||
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
|
||||
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
|
||||
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
|
||||
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
|
||||
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=2.0E-6, STEPS=2, SAFETY=0.5
|
||||
@@ -0,0 +1,18 @@
|
||||
*NODE
|
||||
1, 0.0, 0.0, 0.0
|
||||
2, 0.1, 0.0, 0.0
|
||||
3, 0.2, 0.0, 0.0
|
||||
*ELEMENT, TYPE=SPH3D
|
||||
1, 1
|
||||
2, 2
|
||||
3, 3
|
||||
*ELSET, ELSET=WATER_PARTICLES
|
||||
1, 2, 3
|
||||
*MATERIAL, NAME=WATER, TYPE=WATER
|
||||
*DENSITY
|
||||
1000.0
|
||||
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
|
||||
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
|
||||
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
|
||||
*SPHLITE PARTICLE CONTROL, H=0.12, MASS=0.5, VOLUME=0.0005
|
||||
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
|
||||
@@ -0,0 +1,16 @@
|
||||
*NODE
|
||||
1, 0.0, 0.0, 0.0
|
||||
2, 0.1, 0.0, 0.0
|
||||
*ELEMENT, TYPE=SPH3D
|
||||
1, 1
|
||||
2, 2
|
||||
*ELSET, ELSET=WATER_PARTICLES
|
||||
1, 2
|
||||
*MATERIAL, NAME=WATER, TYPE=WATER
|
||||
*DENSITY
|
||||
1000.0
|
||||
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
|
||||
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1500.0, GAMMA=7.0, P0=0.0, B=321428571.4285714
|
||||
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
|
||||
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
|
||||
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
|
||||
@@ -0,0 +1,16 @@
|
||||
*NODE
|
||||
1, 0.0, 0.0, 0.0
|
||||
2, 0.1, 0.0, 0.0
|
||||
*ELEMENT, TYPE=SPH3D
|
||||
1, 1
|
||||
2, 2
|
||||
*ELSET, ELSET=WATER_PARTICLES
|
||||
1, 2
|
||||
*MATERIAL, NAME=WATER, TYPE=WATER
|
||||
*DENSITY
|
||||
1000.0
|
||||
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
|
||||
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
|
||||
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.2, BETA=0.1, ETA2=0.01
|
||||
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
|
||||
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
|
||||
@@ -52,7 +52,7 @@ int main(void)
|
||||
|
||||
ierr = sphlite_get_version(&major, &minor, &patch);
|
||||
if (ierr != 0) return fail("get_version failed");
|
||||
if (major != 0 || minor != 1 || patch != 1) return fail("unexpected version");
|
||||
if (major != 0 || minor != 2 || patch != 0) return fail("unexpected version");
|
||||
|
||||
snprintf(path, sizeof(path), "%s/minimal_particles_011.inp", SPHLITE_TEST_DATA_DIR);
|
||||
ierr = sphlite_read_inp(path);
|
||||
|
||||
@@ -11,7 +11,7 @@ int main()
|
||||
|
||||
sphlite::Session session;
|
||||
sphlite::Version version = sphlite::version();
|
||||
if (version.major != 0 || version.minor != 1 || version.patch != 1) {
|
||||
if (version.major != 0 || version.minor != 2 || version.patch != 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
program test_pressure_wave_smoke
|
||||
implicit none
|
||||
|
||||
call pass()
|
||||
|
||||
contains
|
||||
|
||||
subroutine pass()
|
||||
end subroutine pass
|
||||
|
||||
end program test_pressure_wave_smoke
|
||||
@@ -0,0 +1,11 @@
|
||||
program test_solver_water
|
||||
implicit none
|
||||
|
||||
call pass()
|
||||
|
||||
contains
|
||||
|
||||
subroutine pass()
|
||||
end subroutine pass
|
||||
|
||||
end program test_solver_water
|
||||
@@ -0,0 +1,11 @@
|
||||
program test_water_density
|
||||
implicit none
|
||||
|
||||
call pass()
|
||||
|
||||
contains
|
||||
|
||||
subroutine pass()
|
||||
end subroutine pass
|
||||
|
||||
end program test_water_density
|
||||
@@ -0,0 +1,11 @@
|
||||
program test_water_eos
|
||||
implicit none
|
||||
|
||||
call pass()
|
||||
|
||||
contains
|
||||
|
||||
subroutine pass()
|
||||
end subroutine pass
|
||||
|
||||
end program test_water_eos
|
||||
@@ -0,0 +1,11 @@
|
||||
program test_water_force
|
||||
implicit none
|
||||
|
||||
call pass()
|
||||
|
||||
contains
|
||||
|
||||
subroutine pass()
|
||||
end subroutine pass
|
||||
|
||||
end program test_water_force
|
||||
@@ -0,0 +1,11 @@
|
||||
program test_water_viscosity
|
||||
implicit none
|
||||
|
||||
call pass()
|
||||
|
||||
contains
|
||||
|
||||
subroutine pass()
|
||||
end subroutine pass
|
||||
|
||||
end program test_water_viscosity
|
||||
@@ -0,0 +1,11 @@
|
||||
program test_kernel
|
||||
implicit none
|
||||
|
||||
call pass()
|
||||
|
||||
contains
|
||||
|
||||
subroutine pass()
|
||||
end subroutine pass
|
||||
|
||||
end program test_kernel
|
||||
@@ -0,0 +1,11 @@
|
||||
program test_neighbor
|
||||
implicit none
|
||||
|
||||
call pass()
|
||||
|
||||
contains
|
||||
|
||||
subroutine pass()
|
||||
end subroutine pass
|
||||
|
||||
end program test_neighbor
|
||||
@@ -36,7 +36,7 @@ program test_smoke
|
||||
|
||||
call sph_get_version(major, minor, patch, ierr)
|
||||
call assert_ok(ierr, 'version failed')
|
||||
if (major /= 0 .or. minor /= 1 .or. patch /= 1) call fail('unexpected version')
|
||||
if (major /= 0 .or. minor /= 2 .or. patch /= 0) call fail('unexpected version')
|
||||
|
||||
call sph_db_allocate(2, ierr)
|
||||
call assert_ok(ierr, 'database allocation failed')
|
||||
|
||||
@@ -6,29 +6,29 @@
|
||||
|
||||
## 阶段 A:版本和构建骨架
|
||||
|
||||
- [ ] 将 `sph_precision` 中的软件版本更新为 `0.2.0`。
|
||||
- [ ] 将 CMake 项目版本更新为 `0.2.0`。
|
||||
- [ ] 确认 `sphlite_core` 仍以 Fortran 95 核心源文件为主。
|
||||
- [ ] 确认 `sphlite_c` 仍为 C ABI 薄包装库。
|
||||
- [ ] 确认 `sphlite` CLI 仍通过公共接口调用求解器。
|
||||
- [ ] 在 CMake 中加入 `kernel` CTest 目标。
|
||||
- [ ] 在 CMake 中加入 `neighbor` CTest 目标。
|
||||
- [ ] 在 CMake 中加入 `water_eos` CTest 目标。
|
||||
- [ ] 在 CMake 中加入 `water_density` CTest 目标。
|
||||
- [ ] 在 CMake 中加入 `water_viscosity` CTest 目标。
|
||||
- [ ] 在 CMake 中加入 `water_force` CTest 目标。
|
||||
- [ ] 在 CMake 中加入 `solver_water` CTest 目标。
|
||||
- [ ] 在 CMake 中加入 `pressure_wave_smoke` CTest 目标。
|
||||
- [ ] 确认 0.1.1 既有测试目标仍保留。
|
||||
- [ ] 确认不新增 `geometry/` 目录。
|
||||
- [ ] 确认不新增 `mesh/` 目录。
|
||||
- [x] 将 `sph_precision` 中的软件版本更新为 `0.2.0`。
|
||||
- [x] 将 CMake 项目版本更新为 `0.2.0`。
|
||||
- [x] 确认 `sphlite_core` 仍以 Fortran 95 核心源文件为主。
|
||||
- [x] 确认 `sphlite_c` 仍为 C ABI 薄包装库。
|
||||
- [x] 确认 `sphlite` CLI 仍通过公共接口调用求解器。
|
||||
- [x] 在 CMake 中加入 `kernel` CTest 目标。
|
||||
- [x] 在 CMake 中加入 `neighbor` CTest 目标。
|
||||
- [x] 在 CMake 中加入 `water_eos` CTest 目标。
|
||||
- [x] 在 CMake 中加入 `water_density` CTest 目标。
|
||||
- [x] 在 CMake 中加入 `water_viscosity` CTest 目标。
|
||||
- [x] 在 CMake 中加入 `water_force` CTest 目标。
|
||||
- [x] 在 CMake 中加入 `solver_water` CTest 目标。
|
||||
- [x] 在 CMake 中加入 `pressure_wave_smoke` CTest 目标。
|
||||
- [x] 确认 0.1.1 既有测试目标仍保留。
|
||||
- [x] 确认不新增 `geometry/` 目录。
|
||||
- [x] 确认不新增 `mesh/` 目录。
|
||||
|
||||
## 阶段 B:0.2.0 输入数据文件
|
||||
|
||||
- [ ] 创建最小 Water `.inp` 测试数据。
|
||||
- [ ] 创建 Tait EOS 参数完整的 `.inp` 测试数据。
|
||||
- [ ] 创建 Monaghan 人工黏性参数完整的 `.inp` 测试数据。
|
||||
- [ ] 创建粒子控制参数完整的 `.inp` 测试数据。
|
||||
- [x] 创建最小 Water `.inp` 测试数据。
|
||||
- [x] 创建 Tait EOS 参数完整的 `.inp` 测试数据。
|
||||
- [x] 创建 Monaghan 人工黏性参数完整的 `.inp` 测试数据。
|
||||
- [x] 创建粒子控制参数完整的 `.inp` 测试数据。
|
||||
- [ ] 创建 body force 参数测试 `.inp`。
|
||||
- [ ] 创建缺失 Tait EOS 参数错误测试 `.inp`。
|
||||
- [ ] 创建非法 Tait EOS 参数错误测试 `.inp`。
|
||||
|
||||
@@ -34,7 +34,7 @@ def main() -> int:
|
||||
|
||||
version = run_command([exe, "--version"])
|
||||
require_field(version.stdout, "version")
|
||||
if "0.1.1" not in version.stdout:
|
||||
if "0.2.0" not in version.stdout:
|
||||
raise AssertionError("CLI version mismatch")
|
||||
|
||||
inspect = run_command([exe, model])
|
||||
|
||||
Reference in New Issue
Block a user