diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ed0c0a..6edbcf2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,7 @@ set(SPHLITE_CORE_SOURCES src/database/sph_database.f90 src/input/sph_inp_defs.f90 src/input/sph_inp_helpers.f90 + src/input/sph_input_time.f90 src/input/sph_input_reader.f90 src/solver/sph_solver_explicit.f90 src/output/sph_output_csv.f90 diff --git a/src/core/sph_control.f90 b/src/core/sph_control.f90 index 9639171..0db6dec 100644 --- a/src/core/sph_control.f90 +++ b/src/core/sph_control.f90 @@ -1,5 +1,6 @@ module sph_control use sph_precision, only: rk + use sph_error, only: SPH_SUCCESS, SPH_ERROR_ARGUMENT, sph_error_set implicit none real(rk), parameter :: SPH_DEFAULT_DT = 1.0e-6_rk @@ -43,6 +44,35 @@ contains if (safety > 0.0_rk) safety_factor = safety end subroutine sph_control_set_time + subroutine sph_control_validate_time(dt, total_time, steps, safety, ierr) + real(rk), intent(in) :: dt + real(rk), intent(in) :: total_time + integer, intent(in) :: steps + real(rk), intent(in) :: safety + integer, intent(out) :: ierr + + ierr = SPH_SUCCESS + if (dt <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'time control DT must be positive') + ierr = SPH_ERROR_ARGUMENT + return + end if + if (total_time <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'time control TIME must be positive') + ierr = SPH_ERROR_ARGUMENT + return + end if + if (steps <= 0) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'time control STEPS must be positive') + ierr = SPH_ERROR_ARGUMENT + return + end if + if (safety <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'time control SAFETY must be positive') + ierr = SPH_ERROR_ARGUMENT + end if + end subroutine sph_control_validate_time + subroutine sph_control_get_time(time, step) real(rk), intent(out) :: time integer, intent(out) :: step diff --git a/src/input/sph_input_reader.f90 b/src/input/sph_input_reader.f90 index 0a9d205..a4e1c76 100644 --- a/src/input/sph_input_reader.f90 +++ b/src/input/sph_input_reader.f90 @@ -1,7 +1,8 @@ module sph_input_reader use sph_precision, only: rk, SPH_NDIM - use sph_error, only: SPH_SUCCESS, SPH_ERROR_IO, SPH_ERROR_INPUT, sph_error_set - use sph_control, only: sph_control_set_time + use sph_error, only: SPH_SUCCESS, SPH_ERROR_IO, SPH_ERROR_INPUT, sph_error_set, & + sph_error_get + use sph_input_time, only: sph_input_parse_time_control use sph_output_csv, only: sph_output_set_directory, sph_output_set_interval use sph_database, only: npart, SPH_MAX_ELEMENT_NODES, & SPH_REGION_COUPLING_CONTACT, SPH_REGION_COUPLING_CONTINUUM, & @@ -263,7 +264,8 @@ contains else if (key_id == SPH_KEY_SPHLITE) then if (index(upper_line, 'TIME CONTROL') > 0) then input_has_time_control = .true. - call sph_input_parse_time_control(line) + call sph_input_parse_time_control(line, input_current_file, & + input_current_line, ierr) else if (index(upper_line, 'OUTPUT') > 0) then call sph_input_parse_output_control(line, ierr) else if (index(upper_line, 'COUPLING REGION') > 0) then @@ -291,6 +293,7 @@ contains else if (key_id == SPH_KEY_UNKNOWN) then input_warning_count = input_warning_count + 1 end if + if (ierr /= SPH_SUCCESS) call sph_input_prefix_current_error(ierr) end subroutine sph_input_record_keyword subroutine sph_input_parse_water_eos(line, ierr) @@ -450,45 +453,6 @@ contains call sph_db_add_coupling_region(name, set_name, region_type, ierr) end subroutine sph_input_parse_coupling_region - subroutine sph_input_parse_time_control(line) - character(len=*), intent(in) :: line - character(len=SPH_INPUT_FIELD_LEN) :: fields(SPH_INPUT_MAX_FIELDS) - character(len=SPH_INPUT_FIELD_LEN) :: item - character(len=SPH_INPUT_FIELD_LEN) :: key - character(len=SPH_INPUT_FIELD_LEN) :: value - integer :: nfields - integer :: i - integer :: eq_pos - integer :: ios - real(rk) :: dt - real(rk) :: total_time - integer :: steps - real(rk) :: safety - - dt = -1.0_rk - total_time = -1.0_rk - steps = -1 - safety = -1.0_rk - call sph_inp_split_csv(line, fields, nfields) - do i = 1, nfields - item = adjustl(fields(i)) - eq_pos = index(item, '=') - if (eq_pos <= 0) cycle - key = sph_inp_upper(adjustl(item(1:eq_pos-1))) - value = adjustl(item(eq_pos+1:len_trim(item))) - if (index(key, 'DT') == 1) then - read(value, *, iostat=ios) dt - else if (index(key, 'TIME') == 1 .or. index(key, 'END TIME') == 1) then - read(value, *, iostat=ios) total_time - else if (index(key, 'STEPS') == 1 .or. index(key, 'MAX STEPS') == 1) then - read(value, *, iostat=ios) steps - else if (index(key, 'SAFETY') == 1) then - read(value, *, iostat=ios) safety - end if - end do - call sph_control_set_time(dt, total_time, steps, safety) - end subroutine sph_input_parse_time_control - subroutine sph_input_parse_node(line, node_index, ierr) character(len=*), intent(in) :: line integer, intent(in) :: node_index @@ -678,4 +642,18 @@ contains call sph_error_set(SPH_ERROR_INPUT, trim(full_message)) end subroutine sph_input_set_error + subroutine sph_input_prefix_current_error(ierr) + integer, intent(in) :: ierr + integer :: code + character(len=SPH_INPUT_LINE_LEN) :: message + character(len=SPH_INPUT_LINE_LEN) :: full_message + + if (ierr == SPH_SUCCESS) return + call sph_error_get(code, message) + if (index(trim(message), trim(input_current_file)//':') == 1) return + write(full_message, '(A,":",I0,": ",A)') trim(input_current_file), & + input_current_line, trim(message) + call sph_error_set(code, trim(full_message)) + end subroutine sph_input_prefix_current_error + end module sph_input_reader diff --git a/src/input/sph_input_time.f90 b/src/input/sph_input_time.f90 new file mode 100644 index 0000000..bdf53b4 --- /dev/null +++ b/src/input/sph_input_time.f90 @@ -0,0 +1,130 @@ +module sph_input_time + use sph_precision, only: rk + use sph_error, only: SPH_SUCCESS, SPH_ERROR_INPUT, sph_error_set, & + sph_error_get + use sph_control, only: sph_control_set_time, sph_control_validate_time + use sph_inp_defs, only: SPH_INPUT_FIELD_LEN, SPH_INPUT_MAX_FIELDS, & + SPH_INPUT_LINE_LEN + use sph_inp_helpers, only: sph_inp_split_csv, sph_inp_upper + implicit none + +contains + + subroutine sph_input_parse_time_control(line, filename, line_number, ierr) + character(len=*), intent(in) :: line + character(len=*), intent(in) :: filename + integer, intent(in) :: line_number + integer, intent(out) :: ierr + character(len=SPH_INPUT_FIELD_LEN) :: fields(SPH_INPUT_MAX_FIELDS) + character(len=SPH_INPUT_FIELD_LEN) :: key + character(len=SPH_INPUT_FIELD_LEN) :: value + integer :: nfields + integer :: i + integer :: eq_pos + real(rk) :: dt + real(rk) :: total_time + integer :: steps + real(rk) :: safety + logical :: has_dt + logical :: has_time + logical :: has_steps + + ierr = SPH_SUCCESS + dt = -1.0_rk + total_time = -1.0_rk + steps = -1 + safety = 1.0_rk + has_dt = .false. + has_time = .false. + has_steps = .false. + call sph_inp_split_csv(line, fields, nfields) + do i = 1, nfields + eq_pos = index(fields(i), '=') + if (eq_pos <= 0) cycle + key = sph_inp_upper(adjustl(fields(i)(1:eq_pos-1))) + value = adjustl(fields(i)(eq_pos+1:len_trim(fields(i)))) + call sph_input_time_parse_item(key, value, dt, total_time, steps, & + safety, has_dt, has_time, has_steps, filename, line_number, ierr) + if (ierr /= SPH_SUCCESS) return + end do + if (.not. has_dt .or. .not. has_time .or. .not. has_steps) then + call sph_input_time_set_error(filename, line_number, & + 'missing required SPHLITE TIME CONTROL option', ierr) + return + end if + call sph_control_validate_time(dt, total_time, steps, safety, ierr) + if (ierr /= SPH_SUCCESS) then + call sph_input_time_prefix_error(filename, line_number, ierr) + return + end if + call sph_control_set_time(dt, total_time, steps, safety) + end subroutine sph_input_parse_time_control + + subroutine sph_input_time_parse_item(key, value, dt, total_time, steps, & + safety, has_dt, has_time, has_steps, filename, line_number, ierr) + character(len=*), intent(in) :: key + character(len=*), intent(in) :: value + real(rk), intent(inout) :: dt + real(rk), intent(inout) :: total_time + integer, intent(inout) :: steps + real(rk), intent(inout) :: safety + logical, intent(inout) :: has_dt + logical, intent(inout) :: has_time + logical, intent(inout) :: has_steps + character(len=*), intent(in) :: filename + integer, intent(in) :: line_number + integer, intent(out) :: ierr + integer :: ios + + ierr = SPH_SUCCESS + if (index(key, 'DT') == 1) then + read(value, *, iostat=ios) dt + has_dt = ios == 0 + if (ios /= 0) call sph_input_time_set_error(filename, line_number, & + 'invalid SPHLITE TIME CONTROL DT', ierr) + else if (index(key, 'TIME') == 1 .or. index(key, 'END TIME') == 1) then + read(value, *, iostat=ios) total_time + has_time = ios == 0 + if (ios /= 0) call sph_input_time_set_error(filename, line_number, & + 'invalid SPHLITE TIME CONTROL TIME', ierr) + else if (index(key, 'STEPS') == 1 .or. index(key, 'MAX STEPS') == 1) then + read(value, *, iostat=ios) steps + has_steps = ios == 0 + if (ios /= 0) call sph_input_time_set_error(filename, line_number, & + 'invalid SPHLITE TIME CONTROL STEPS', ierr) + else if (index(key, 'SAFETY') == 1) then + read(value, *, iostat=ios) safety + if (ios /= 0) call sph_input_time_set_error(filename, line_number, & + 'invalid SPHLITE TIME CONTROL SAFETY', ierr) + end if + end subroutine sph_input_time_parse_item + + subroutine sph_input_time_set_error(filename, line_number, message, ierr) + character(len=*), intent(in) :: filename + integer, intent(in) :: line_number + character(len=*), intent(in) :: message + integer, intent(out) :: ierr + character(len=SPH_INPUT_LINE_LEN) :: full_message + + write(full_message, '(A,":",I0,": ",A)') trim(filename), line_number, & + trim(message) + call sph_error_set(SPH_ERROR_INPUT, trim(full_message)) + ierr = SPH_ERROR_INPUT + end subroutine sph_input_time_set_error + + subroutine sph_input_time_prefix_error(filename, line_number, ierr) + character(len=*), intent(in) :: filename + integer, intent(in) :: line_number + integer, intent(in) :: ierr + integer :: code + character(len=SPH_INPUT_LINE_LEN) :: message + character(len=SPH_INPUT_LINE_LEN) :: full_message + + if (ierr == SPH_SUCCESS) return + call sph_error_get(code, message) + write(full_message, '(A,":",I0,": ",A)') trim(filename), line_number, & + trim(message) + call sph_error_set(code, trim(full_message)) + end subroutine sph_input_time_prefix_error + +end module sph_input_time diff --git a/tests/data/water_bad_particle_volume_021.inp b/tests/data/water_bad_particle_volume_021.inp new file mode 100644 index 0000000..77821ac --- /dev/null +++ b/tests/data/water_bad_particle_volume_021.inp @@ -0,0 +1,14 @@ +*NODE +1, 0.0, 0.0, 0.0 +*ELEMENT, TYPE=SPH3D +1, 1 +*ELSET, ELSET=WATER_PARTICLES +1 +*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.0 +*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5 diff --git a/tests/module/test_input.f90 b/tests/module/test_input.f90 index fbbbab7..db09274 100644 --- a/tests/module/test_input.f90 +++ b/tests/module/test_input.f90 @@ -1,7 +1,8 @@ program test_input use sph_error, only: SPH_SUCCESS use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, & - sph_build_model, sph_get_particle_count, sph_get_input_warning_count + sph_build_model, sph_get_particle_count, sph_get_input_warning_count, & + sph_get_last_error use sph_input_reader, only: sph_input_get_warning_count use sph_database, only: material_count, section_count, nset_count, & elset_count, element_count, coupling_region_count, particle_phase, & @@ -46,6 +47,18 @@ program test_input call sph_finalize(ierr) call assert_ok(ierr, 'finalize failed after unknown keyword input') + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for SPHLITE warning input') + call sph_read_inp('tests/data/water_unknown_sphlite_warning_021.inp', ierr) + call assert_ok(ierr, 'SPHLITE warning input read failed') + call sph_get_input_warning_count(warnings, ierr) + call assert_ok(ierr, 'SPHLITE warning count API failed') + if (warnings <= 0) call fail('SPHLITE warning was not reported') + call sph_build_model(ierr) + call assert_ok(ierr, 'SPHLITE warning input build failed') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed after SPHLITE warning input') + call check_input_fails('tests/data/missing_material_011.inp') call check_bad_input('tests/data/missing_section_011.inp') call check_bad_input('tests/data/missing_time_control_011.inp') @@ -66,6 +79,10 @@ program test_input call check_input_fails('tests/data/water_bad_viscosity_eta2_021.inp') call check_input_fails('tests/data/water_bad_particle_control_020.inp') call check_input_fails('tests/data/water_bad_particle_control_value_021.inp') + call check_input_fails('tests/data/water_bad_particle_volume_021.inp') + call check_input_fails('tests/data/water_bad_body_force_field_021.inp') + call check_input_fails('tests/data/water_bad_time_control_021.inp') + call check_error_context('tests/data/water_missing_eos_rho0_021.inp', ':11:') contains @@ -131,6 +148,24 @@ contains call assert_ok(ierr, 'finalize failed after failing input') end subroutine check_input_fails + subroutine check_error_context(filename, line_fragment) + character(len=*), intent(in) :: filename + character(len=*), intent(in) :: line_fragment + integer :: code + character(len=256) :: message + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for error context') + call sph_read_inp(filename, ierr) + if (ierr == SPH_SUCCESS) call fail('error context input did not fail') + call sph_get_last_error(code, message, ierr) + call assert_ok(ierr, 'last error query failed') + if (index(message, trim(filename)) <= 0) call fail('input error missing filename') + if (index(message, trim(line_fragment)) <= 0) call fail('input error missing line context') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed after error context') + end subroutine check_error_context + subroutine assert_ok(ierr_value, message) integer, intent(in) :: ierr_value character(len=*), intent(in) :: message diff --git a/tests/module/test_restart.f90 b/tests/module/test_restart.f90 index 6129f7f..fba3ff1 100644 --- a/tests/module/test_restart.f90 +++ b/tests/module/test_restart.f90 @@ -4,6 +4,8 @@ program test_restart use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model, & sph_run_explicit, sph_get_current_time, sph_write_restart, sph_read_restart, & sph_advance_explicit + use sph_database, only: particle_id_ext, particle_phase, particle_status, & + material_id, section_id, x0, x, v, a, SPH_PHASE_WATER, SPH_STATUS_ACTIVE implicit none integer :: ierr @@ -18,6 +20,7 @@ program test_restart call assert_ok(ierr, 'read input failed') call sph_build_model(ierr) call assert_ok(ierr, 'build model failed') + call assert_build_state() call sph_run_explicit(ierr) call assert_ok(ierr, 'run explicit failed') call sph_get_current_time(written_time, written_step, ierr) @@ -26,6 +29,7 @@ program test_restart call assert_ok(ierr, 'write restart failed') call sph_read_restart('build-codex-unix/restart_test.tmp', ierr) call assert_ok(ierr, 'read restart failed') + call assert_restart_identity() call sph_get_current_time(time, step, ierr) call assert_ok(ierr, 'time after restart failed') if (step /= written_step) call fail('restart did not restore step') @@ -44,6 +48,28 @@ contains if (ierr_value /= SPH_SUCCESS) call fail(message) end subroutine assert_ok + subroutine assert_build_state() + if (particle_id_ext(1) /= 1 .or. particle_id_ext(4) /= 4) then + call fail('build particle ids are not stable') + end if + if (particle_phase(1) /= SPH_PHASE_WATER) call fail('build phase mismatch') + if (particle_status(1) /= SPH_STATUS_ACTIVE) call fail('build status mismatch') + if (material_id(1) /= 1) call fail('build material id mismatch') + if (section_id(1) /= 1) call fail('build section id mismatch') + if (maxval(abs(x0(:,2) - (/0.1_rk, 0.0_rk, 0.0_rk/))) > 1.0e-12_rk) then + call fail('build x0 initialization mismatch') + end if + if (maxval(abs(x(:,2) - x0(:,2))) > 1.0e-12_rk) call fail('build x mismatch') + if (maxval(abs(v)) > 1.0e-12_rk) call fail('build velocity mismatch') + if (maxval(abs(a)) > 1.0e-12_rk) call fail('build acceleration mismatch') + end subroutine assert_build_state + + subroutine assert_restart_identity() + if (particle_id_ext(1) /= 1 .or. particle_id_ext(4) /= 4) then + call fail('restart particle ids are not stable') + end if + end subroutine assert_restart_identity + subroutine fail(message) character(len=*), intent(in) :: message diff --git a/todo.md b/todo.md index 668a6dd..b5c0026 100644 --- a/todo.md +++ b/todo.md @@ -72,29 +72,29 @@ - [x] 加固 `*SPHLITE VISCOSITY` 的 `ETA2` 字段校验。 - [x] 加固 `*SPHLITE PARTICLE CONTROL` 的 `H` 正值校验。 - [x] 加固 `*SPHLITE PARTICLE CONTROL` 的 `MASS` 正值校验。 -- [ ] 加固 `*SPHLITE PARTICLE CONTROL` 的 `VOLUME` 正值校验。 -- [ ] 加固 `*SPHLITE BODY FORCE` 三维分量解析。 -- [ ] 加固 `*SPHLITE TIME CONTROL` 的 `DT` 正值校验。 -- [ ] 加固 `*SPHLITE TIME CONTROL` 的 `TIME` 正值校验。 -- [ ] 加固 `*SPHLITE TIME CONTROL` 的 `STEPS` 正值校验。 -- [ ] 加固 `*SPHLITE TIME CONTROL` 的 `SAFETY` 正值校验。 -- [ ] 确认 unsupported-but-safe 关键词报 warning。 -- [ ] 确认无法运行的缺失关键词报 error。 -- [ ] 确认输入错误消息包含文件名。 -- [ ] 确认输入错误消息包含行号或定位上下文。 +- [x] 加固 `*SPHLITE PARTICLE CONTROL` 的 `VOLUME` 正值校验。 +- [x] 加固 `*SPHLITE BODY FORCE` 三维分量解析。 +- [x] 加固 `*SPHLITE TIME CONTROL` 的 `DT` 正值校验。 +- [x] 加固 `*SPHLITE TIME CONTROL` 的 `TIME` 正值校验。 +- [x] 加固 `*SPHLITE TIME CONTROL` 的 `STEPS` 正值校验。 +- [x] 加固 `*SPHLITE TIME CONTROL` 的 `SAFETY` 正值校验。 +- [x] 确认 unsupported-but-safe 关键词报 warning。 +- [x] 确认无法运行的缺失关键词报 error。 +- [x] 确认输入错误消息包含文件名。 +- [x] 确认输入错误消息包含行号或定位上下文。 ## 阶段 D:Database 状态一致性 -- [ ] 确认 `particle_id_ext` 在 build 后稳定。 -- [ ] 确认 `particle_id_ext` 在 restart 读回后稳定。 -- [ ] 确认 `particle_phase` 在 build 后一致。 -- [ ] 确认 `particle_status` 在 build 后一致。 -- [ ] 确认 `material_id` 在 build 后一致。 -- [ ] 确认 `section_id` 在 build 后一致。 -- [ ] 确认 `x0(3,npart)` 初始化路径一致。 -- [ ] 确认 `x(3,npart)` 初始化路径一致。 -- [ ] 确认 `v(3,npart)` 初始化路径一致。 -- [ ] 确认 `a(3,npart)` 初始化路径一致。 +- [x] 确认 `particle_id_ext` 在 build 后稳定。 +- [x] 确认 `particle_id_ext` 在 restart 读回后稳定。 +- [x] 确认 `particle_phase` 在 build 后一致。 +- [x] 确认 `particle_status` 在 build 后一致。 +- [x] 确认 `material_id` 在 build 后一致。 +- [x] 确认 `section_id` 在 build 后一致。 +- [x] 确认 `x0(3,npart)` 初始化路径一致。 +- [x] 确认 `x(3,npart)` 初始化路径一致。 +- [x] 确认 `v(3,npart)` 初始化路径一致。 +- [x] 确认 `a(3,npart)` 初始化路径一致。 - [ ] 确认 `vhalf(3,npart)` 初始化路径一致。 - [ ] 确认 `mass(npart)` 初始化路径一致。 - [ ] 确认 `rho(npart)` 初始化路径一致。