From 6d06fd489a895c725d74c2bb4e9455a6058d675b Mon Sep 17 00:00:00 2001 From: Codex Date: Sat, 4 Jul 2026 00:11:54 +0800 Subject: [PATCH] Add 0.7.1 blast region input stabilization --- CMakeLists.txt | 12 +++ src/blast/sph_blast.f90 | 33 ++++++- src/input/sph_input_reader.f90 | 33 ++++++- tests/data/blast_bad_center_071.inp | 26 +++++ tests/data/blast_bad_enabled_071.inp | 26 +++++ tests/data/blast_duplicate_region_071.inp | 27 ++++++ tests/data/blast_multiregion_071.inp | 65 +++++++++++++ tests/module/test_input_blast_multiregion.f90 | 95 +++++++++++++++++++ .../test_input_blast_region_errors_071.f90 | 94 ++++++++++++++++++ todo.md | 46 ++++----- 10 files changed, 428 insertions(+), 29 deletions(-) create mode 100644 tests/data/blast_bad_center_071.inp create mode 100644 tests/data/blast_bad_enabled_071.inp create mode 100644 tests/data/blast_duplicate_region_071.inp create mode 100644 tests/data/blast_multiregion_071.inp create mode 100644 tests/module/test_input_blast_multiregion.f90 create mode 100644 tests/module/test_input_blast_region_errors_071.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2273ecc..e201321 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,6 +192,18 @@ set_target_properties(test_input_blast_errors PROPERTIES Fortran_MODULE_DIRECTOR add_test(NAME input_blast_errors COMMAND test_input_blast_errors) set_tests_properties(input_blast_errors PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_input_blast_multiregion tests/module/test_input_blast_multiregion.f90) +target_link_libraries(test_input_blast_multiregion PRIVATE sphlite_core) +set_target_properties(test_input_blast_multiregion PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME input_blast_multiregion COMMAND test_input_blast_multiregion) +set_tests_properties(input_blast_multiregion PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_input_blast_region_errors_071 tests/module/test_input_blast_region_errors_071.f90) +target_link_libraries(test_input_blast_region_errors_071 PRIVATE sphlite_core) +set_target_properties(test_input_blast_region_errors_071 PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME input_blast_region_errors_071 COMMAND test_input_blast_region_errors_071) +set_tests_properties(input_blast_region_errors_071 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_blast_source_snapshot tests/module/test_blast_source_snapshot.f90) target_link_libraries(test_blast_source_snapshot PRIVATE sphlite_core) set_target_properties(test_blast_source_snapshot PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") diff --git a/src/blast/sph_blast.f90 b/src/blast/sph_blast.f90 index 8e212da..80c9ed0 100644 --- a/src/blast/sph_blast.f90 +++ b/src/blast/sph_blast.f90 @@ -92,7 +92,8 @@ contains end subroutine sph_blast_clear_snapshot subroutine sph_blast_add_region(name, center, radius, source_phase_name, & - target_phase_name, target_set_name, scale, time_window, mode_name, ierr) + target_phase_name, target_set_name, scale, time_window, mode_name, ierr, & + enabled) character(len=*), intent(in) :: name real(rk), intent(in) :: center(SPH_NDIM) real(rk), intent(in) :: radius @@ -103,10 +104,12 @@ contains real(rk), intent(in) :: time_window character(len=*), intent(in) :: mode_name integer, intent(out) :: ierr + logical, intent(in), optional :: enabled integer :: source_phase integer :: target_phase integer :: projection_mode logical :: is_disabled + character(len=SPH_NAME_LEN) :: resolved_name ierr = SPH_SUCCESS if (blast_region_count >= SPH_MAX_REGIONS) then @@ -114,6 +117,13 @@ contains ierr = SPH_ERROR_DATABASE return end if + resolved_name = name + if (len_trim(resolved_name) == 0) resolved_name = 'BLAST' + if (sph_blast_region_name_exists(resolved_name)) then + call sph_error_set(SPH_ERROR_INPUT, 'Blast region NAME is duplicated') + ierr = SPH_ERROR_INPUT + return + end if if (.not. sph_blast_real_is_finite(radius) .or. radius <= 0.0_rk) then call sph_error_set(SPH_ERROR_INPUT, 'Blast region RADIUS must be positive') ierr = SPH_ERROR_INPUT @@ -169,10 +179,8 @@ contains end if blast_region_count = blast_region_count + 1 - blast_region_name(blast_region_count) = name - if (len_trim(blast_region_name(blast_region_count)) == 0) then - blast_region_name(blast_region_count) = 'BLAST' - end if + if (present(enabled)) is_disabled = is_disabled .or. (.not. enabled) + blast_region_name(blast_region_count) = resolved_name blast_center(:,blast_region_count) = center(:) blast_radius(blast_region_count) = radius blast_source_phase(blast_region_count) = source_phase @@ -184,6 +192,21 @@ contains blast_region_enabled(blast_region_count) = .not. is_disabled end subroutine sph_blast_add_region + logical function sph_blast_region_name_exists(name) + character(len=*), intent(in) :: name + integer :: i + character(len=SPH_NAME_LEN) :: upper_name + + upper_name = sph_blast_upper(name) + sph_blast_region_name_exists = .false. + do i = 1, blast_region_count + if (trim(sph_blast_upper(blast_region_name(i))) == trim(upper_name)) then + sph_blast_region_name_exists = .true. + return + end if + end do + end function sph_blast_region_name_exists + subroutine sph_blast_count_unused_regions(count) integer, intent(out) :: count integer :: i diff --git a/src/input/sph_input_reader.f90 b/src/input/sph_input_reader.f90 index af795bd..0cfd672 100644 --- a/src/input/sph_input_reader.f90 +++ b/src/input/sph_input_reader.f90 @@ -756,12 +756,14 @@ contains real(rk) :: radius real(rk) :: scale real(rk) :: time_window + logical :: enabled ierr = SPH_SUCCESS center = 0.0_rk radius = 0.0_rk scale = 1.0_rk time_window = 0.0_rk + enabled = .true. call sph_input_get_option(line, 'NAME', name) if (len_trim(name) == 0) name = 'BLAST' call sph_input_get_optional_real(line, 'X', center(1), ierr) @@ -803,8 +805,16 @@ contains call sph_input_get_option(line, 'MODE', mode_name) if (len_trim(mode_name) == 0) call sph_input_get_option(line, 'PROJECTION', mode_name) if (len_trim(mode_name) == 0) mode_name = 'RADIAL' + call sph_input_get_option(line, 'ENABLED', value) + if (len_trim(value) == 0) call sph_input_get_option(line, 'ACTIVE', value) + if (len_trim(value) > 0) then + call sph_input_parse_logical_value(value, enabled, & + 'invalid blast ENABLED option', ierr) + if (ierr /= SPH_SUCCESS) return + end if call sph_blast_add_region(name, center, radius, source_phase, & - target_phase, target_set, scale, time_window, mode_name, ierr) + target_phase, target_set, scale, time_window, mode_name, ierr, & + enabled) end subroutine sph_input_parse_blast_region subroutine sph_input_parse_shell_director(line, ierr) @@ -1355,6 +1365,27 @@ contains end if end subroutine sph_input_parse_real_value + subroutine sph_input_parse_logical_value(text, value, message, ierr) + character(len=*), intent(in) :: text + logical, intent(out) :: value + character(len=*), intent(in) :: message + integer, intent(out) :: ierr + character(len=SPH_INPUT_FIELD_LEN) :: upper_text + + ierr = SPH_SUCCESS + upper_text = sph_inp_upper(adjustl(text)) + if (trim(upper_text) == 'TRUE' .or. trim(upper_text) == 'YES' .or. & + trim(upper_text) == 'ON' .or. trim(upper_text) == '1') then + value = .true. + else if (trim(upper_text) == 'FALSE' .or. trim(upper_text) == 'NO' .or. & + trim(upper_text) == 'OFF' .or. trim(upper_text) == '0') then + value = .false. + else + call sph_input_set_error(message) + ierr = SPH_ERROR_INPUT + end if + end subroutine sph_input_parse_logical_value + subroutine sph_input_set_error(message) character(len=*), intent(in) :: message character(len=SPH_INPUT_LINE_LEN) :: full_message diff --git a/tests/data/blast_bad_center_071.inp b/tests/data/blast_bad_center_071.inp new file mode 100644 index 0000000..865d8aa --- /dev/null +++ b/tests/data/blast_bad_center_071.inp @@ -0,0 +1,26 @@ +*NODE +1, 0.00, 0.0, 0.0 +2, 0.30, 0.0, 0.0 +3, 0.52, 0.0, 0.0 +*ELEMENT, TYPE=SPH3D +1, 1 +2, 2 +3, 3 +*ELSET, ELSET=PRODUCT_PARTICLES +2 +*ELSET, ELSET=SOLID_TARGET +3 +*MATERIAL, NAME=PRODUCTS, TYPE=GAS +*DENSITY +1600.0 +*SECTION, ELSET=PRODUCT_PARTICLES, MATERIAL=PRODUCTS +*MATERIAL, NAME=STEEL_SOLID, TYPE=SOLID +*DENSITY +7850.0 +*ELASTIC +210.0E9, 0.30 +*SOLID SECTION, ELSET=SOLID_TARGET, MATERIAL=STEEL_SOLID +*SPHLITE EOS, TYPE=JWL, MATERIAL=PRODUCTS, RHO0=1600.0, A=3.712E11, B=3.231E9, R1=4.15, R2=0.95, OMEGA=0.3, E0=4.2E6 +*SPHLITE BLAST REGION, NAME=BAD_CENTER, X=NaN, Y=0.0, Z=0.0, RADIUS=0.50, SOURCE_PHASE=GAS, TARGET_PHASE=SOLID, TARGET_SET=SOLID_TARGET, SCALE=1.0, TIME_WINDOW=1.0E-7, MODE=RADIAL +*SPHLITE PARTICLE CONTROL, H=0.12, MASS=0.02, VOLUME=1.25E-5 +*SPHLITE TIME CONTROL, DT=1.0E-7, TIME=1.0E-7, STEPS=1, SAFETY=0.5 diff --git a/tests/data/blast_bad_enabled_071.inp b/tests/data/blast_bad_enabled_071.inp new file mode 100644 index 0000000..9b20d0a --- /dev/null +++ b/tests/data/blast_bad_enabled_071.inp @@ -0,0 +1,26 @@ +*NODE +1, 0.00, 0.0, 0.0 +2, 0.30, 0.0, 0.0 +3, 0.52, 0.0, 0.0 +*ELEMENT, TYPE=SPH3D +1, 1 +2, 2 +3, 3 +*ELSET, ELSET=PRODUCT_PARTICLES +2 +*ELSET, ELSET=SOLID_TARGET +3 +*MATERIAL, NAME=PRODUCTS, TYPE=GAS +*DENSITY +1600.0 +*SECTION, ELSET=PRODUCT_PARTICLES, MATERIAL=PRODUCTS +*MATERIAL, NAME=STEEL_SOLID, TYPE=SOLID +*DENSITY +7850.0 +*ELASTIC +210.0E9, 0.30 +*SOLID SECTION, ELSET=SOLID_TARGET, MATERIAL=STEEL_SOLID +*SPHLITE EOS, TYPE=JWL, MATERIAL=PRODUCTS, RHO0=1600.0, A=3.712E11, B=3.231E9, R1=4.15, R2=0.95, OMEGA=0.3, E0=4.2E6 +*SPHLITE BLAST REGION, NAME=BAD_ENABLED, X=0.30, Y=0.0, Z=0.0, RADIUS=0.50, SOURCE_PHASE=GAS, TARGET_PHASE=SOLID, TARGET_SET=SOLID_TARGET, SCALE=1.0, TIME_WINDOW=1.0E-7, MODE=RADIAL, ENABLED=MAYBE +*SPHLITE PARTICLE CONTROL, H=0.12, MASS=0.02, VOLUME=1.25E-5 +*SPHLITE TIME CONTROL, DT=1.0E-7, TIME=1.0E-7, STEPS=1, SAFETY=0.5 diff --git a/tests/data/blast_duplicate_region_071.inp b/tests/data/blast_duplicate_region_071.inp new file mode 100644 index 0000000..7f6d1aa --- /dev/null +++ b/tests/data/blast_duplicate_region_071.inp @@ -0,0 +1,27 @@ +*NODE +1, 0.00, 0.0, 0.0 +2, 0.30, 0.0, 0.0 +3, 0.52, 0.0, 0.0 +*ELEMENT, TYPE=SPH3D +1, 1 +2, 2 +3, 3 +*ELSET, ELSET=PRODUCT_PARTICLES +2 +*ELSET, ELSET=SOLID_TARGET +3 +*MATERIAL, NAME=PRODUCTS, TYPE=GAS +*DENSITY +1600.0 +*SECTION, ELSET=PRODUCT_PARTICLES, MATERIAL=PRODUCTS +*MATERIAL, NAME=STEEL_SOLID, TYPE=SOLID +*DENSITY +7850.0 +*ELASTIC +210.0E9, 0.30 +*SOLID SECTION, ELSET=SOLID_TARGET, MATERIAL=STEEL_SOLID +*SPHLITE EOS, TYPE=JWL, MATERIAL=PRODUCTS, RHO0=1600.0, A=3.712E11, B=3.231E9, R1=4.15, R2=0.95, OMEGA=0.3, E0=4.2E6 +*SPHLITE BLAST REGION, NAME=DUPLICATE, X=0.30, Y=0.0, Z=0.0, RADIUS=0.50, SOURCE_PHASE=GAS, TARGET_PHASE=SOLID, TARGET_SET=SOLID_TARGET, SCALE=1.0, TIME_WINDOW=1.0E-7, MODE=RADIAL +*SPHLITE BLAST REGION, NAME=DUPLICATE, X=0.30, Y=0.0, Z=0.0, RADIUS=0.50, SOURCE_PHASE=GAS, TARGET_PHASE=SOLID, TARGET_SET=SOLID_TARGET, SCALE=1.0, TIME_WINDOW=1.0E-7, MODE=RADIAL +*SPHLITE PARTICLE CONTROL, H=0.12, MASS=0.02, VOLUME=1.25E-5 +*SPHLITE TIME CONTROL, DT=1.0E-7, TIME=1.0E-7, STEPS=1, SAFETY=0.5 diff --git a/tests/data/blast_multiregion_071.inp b/tests/data/blast_multiregion_071.inp new file mode 100644 index 0000000..ec78047 --- /dev/null +++ b/tests/data/blast_multiregion_071.inp @@ -0,0 +1,65 @@ +*NODE +1, 0.00, 0.0, 0.0 +2, 0.08, 0.0, 0.0 +3, 0.30, 0.0, 0.0 +4, 0.36, 0.0, 0.0 +5, 0.52, 0.0, 0.0 +6, 0.60, 0.0, 0.0 +7, 0.52, 0.1, 0.0 +8, 0.60, 0.1, 0.0 +*ELEMENT, TYPE=SPH3D +1, 1 +2, 2 +3, 3 +4, 4 +5, 5 +6, 6 +7, 7 +8, 8 +*ELSET, ELSET=WATER_PARTICLES +1, 2 +*ELSET, ELSET=CHARGE_PARTICLES +3 +*ELSET, ELSET=PRODUCT_PARTICLES +4 +*ELSET, ELSET=SOLID_TARGET +5, 6 +*ELSET, ELSET=SHELL_TARGET +7, 8 +*ELSET, ELSET=STRUCTURE_TARGET +5, 6, 7, 8 +*MATERIAL, NAME=WATER, TYPE=WATER +*DENSITY +1000.0 +*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER +*MATERIAL, NAME=TNT, TYPE=EXPLOSIVE +*DENSITY +1600.0 +*SECTION, ELSET=CHARGE_PARTICLES, MATERIAL=TNT +*MATERIAL, NAME=PRODUCTS, TYPE=GAS +*DENSITY +1600.0 +*SECTION, ELSET=PRODUCT_PARTICLES, MATERIAL=PRODUCTS +*MATERIAL, NAME=STEEL_SOLID, TYPE=SOLID +*DENSITY +7850.0 +*ELASTIC +210.0E9, 0.30 +*SOLID SECTION, ELSET=SOLID_TARGET, MATERIAL=STEEL_SOLID +*MATERIAL, NAME=STEEL_SHELL, TYPE=SHELL +*DENSITY +7850.0 +*ELASTIC +210.0E9, 0.30 +*SHELL SECTION, ELSET=SHELL_TARGET, MATERIAL=STEEL_SHELL, THICKNESS=0.010, POINTS=3, SHEAR_CORRECTION=0.8333333333 +*SPHLITE SHELL DIRECTOR, SET=SHELL_TARGET, NX=0.0, NY=0.0, NZ=1.0 +*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 EOS, TYPE=JWL, MATERIAL=PRODUCTS, RHO0=1600.0, A=3.712E11, B=3.231E9, R1=4.15, R2=0.95, OMEGA=0.3, E0=4.2E6 +*SPHLITE EXPLOSIVE, MATERIAL=TNT, TYPE=PROGRAMMED_BURN, DETONATION_VELOCITY=6900.0, ENERGY=4.2E6, BURN_TIME=1.0E-7, PRODUCT_MATERIAL=PRODUCTS, CONVERSION=SOURCE +*SPHLITE IGNITION, MATERIAL=TNT, X=0.30, Y=0.0, Z=0.0, TIME=0.0 +*SPHLITE BLAST REGION, NAME=SOLID_REGION, X=0.30, Y=0.0, Z=0.0, RADIUS=0.50, SOURCE_PHASE=GAS, TARGET_PHASE=SOLID, TARGET_SET=SOLID_TARGET, SCALE=1.0, TIME_WINDOW=2.0E-7, MODE=RADIAL +*SPHLITE BLAST REGION, NAME=SHELL_REGION, X=0.30, Y=0.0, Z=0.0, RADIUS=0.50, SOURCE_PHASE=GAS, TARGET_PHASE=SHELL, TARGET_SET=SHELL_TARGET, SCALE=0.50, TIME_WINDOW=1.0E-7, MODE=RADIAL, ENABLED=YES +*SPHLITE BLAST REGION, NAME=DISABLED_REGION, X=0.30, Y=0.0, Z=0.0, RADIUS=0.50, SOURCE_PHASE=GAS, TARGET_PHASE=STRUCTURE, TARGET_SET=STRUCTURE_TARGET, SCALE=1.0, TIME_WINDOW=2.0E-7, MODE=RADIAL, ENABLED=NO +*SPHLITE PARTICLE CONTROL, H=0.12, MASS=0.02, VOLUME=1.25E-5 +*SPHLITE TIME CONTROL, DT=1.0E-7, TIME=2.0E-7, STEPS=2, SAFETY=0.5 diff --git a/tests/module/test_input_blast_multiregion.f90 b/tests/module/test_input_blast_multiregion.f90 new file mode 100644 index 0000000..5623d9c --- /dev/null +++ b/tests/module/test_input_blast_multiregion.f90 @@ -0,0 +1,95 @@ +program test_input_blast_multiregion + use sph_precision, only: rk + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, & + sph_build_model, sph_get_input_warning_count + use sph_blast, only: blast_region_count, blast_region_name, & + blast_target_set_name, blast_source_phase, blast_target_phase, & + blast_region_enabled, blast_radius, blast_load_scale, blast_time_window, & + SPH_BLAST_PHASE_GAS, SPH_BLAST_PHASE_SOLID, SPH_BLAST_PHASE_SHELL, & + SPH_BLAST_PHASE_STRUCTURE + implicit none + + integer :: ierr + integer :: warnings + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed') + call sph_read_inp('tests/data/blast_multiregion_071.inp', ierr) + call assert_ok(ierr, 'read multiregion Blast input failed') + if (blast_region_count /= 3) call fail('Blast multiregion count mismatch') + + call assert_region(1, 'SOLID_REGION', 'SOLID_TARGET', SPH_BLAST_PHASE_SOLID, & + .true., 1.0_rk, 2.0e-7_rk) + call assert_region(2, 'SHELL_REGION', 'SHELL_TARGET', SPH_BLAST_PHASE_SHELL, & + .true., 0.50_rk, 1.0e-7_rk) + call assert_region(3, 'DISABLED_REGION', 'STRUCTURE_TARGET', & + SPH_BLAST_PHASE_STRUCTURE, .false., 1.0_rk, 2.0e-7_rk) + + call sph_build_model(ierr) + call assert_ok(ierr, 'build multiregion Blast input failed') + call sph_get_input_warning_count(warnings, ierr) + call assert_ok(ierr, 'Blast warning count failed') + if (warnings <= 0) call fail('disabled Blast region warning missing') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed') + +contains + + subroutine assert_region(region, expected_name, expected_set, & + expected_target_phase, expected_enabled, expected_scale, & + expected_time_window) + integer, intent(in) :: region + character(len=*), intent(in) :: expected_name + character(len=*), intent(in) :: expected_set + integer, intent(in) :: expected_target_phase + logical, intent(in) :: expected_enabled + real(rk), intent(in) :: expected_scale + real(rk), intent(in) :: expected_time_window + + if (trim(blast_region_name(region)) /= trim(expected_name)) then + call fail('Blast region name mismatch') + end if + if (trim(blast_target_set_name(region)) /= trim(expected_set)) then + call fail('Blast region target set mismatch') + end if + if (blast_source_phase(region) /= SPH_BLAST_PHASE_GAS) then + call fail('Blast region source phase mismatch') + end if + if (blast_target_phase(region) /= expected_target_phase) then + call fail('Blast region target phase mismatch') + end if + if (blast_region_enabled(region) .neqv. expected_enabled) then + call fail('Blast region enabled flag mismatch') + end if + call assert_close(blast_radius(region), 0.50_rk, & + 'Blast region radius mismatch') + call assert_close(blast_load_scale(region), expected_scale, & + 'Blast region scale mismatch') + call assert_close(blast_time_window(region), expected_time_window, & + 'Blast region time window mismatch') + end subroutine assert_region + + subroutine assert_ok(ierr_value, message) + integer, intent(in) :: ierr_value + character(len=*), intent(in) :: message + + if (ierr_value /= SPH_SUCCESS) call fail(message) + end subroutine assert_ok + + subroutine assert_close(actual, expected, message) + real(rk), intent(in) :: actual + real(rk), intent(in) :: expected + character(len=*), intent(in) :: message + + if (abs(actual - expected) > 1.0e-12_rk) call fail(message) + end subroutine assert_close + + subroutine fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_input_blast_multiregion diff --git a/tests/module/test_input_blast_region_errors_071.f90 b/tests/module/test_input_blast_region_errors_071.f90 new file mode 100644 index 0000000..c71ab25 --- /dev/null +++ b/tests/module/test_input_blast_region_errors_071.f90 @@ -0,0 +1,94 @@ +program test_input_blast_region_errors_071 + use sph_precision, only: rk, SPH_NDIM + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model + use sph_blast, only: sph_blast_reset, sph_blast_add_region + use sph_database, only: SPH_MAX_REGIONS + implicit none + + call expect_input_error('tests/data/blast_duplicate_region_071.inp', & + 'duplicate Blast region') + call expect_input_error('tests/data/blast_bad_center_071.inp', & + 'bad Blast center') + call expect_input_error('tests/data/blast_bad_enabled_071.inp', & + 'bad Blast enabled flag') + call expect_direct_error('bad source phase', 'PLASMA', 'SOLID', & + 0.40_rk, 1.0_rk, 0.0_rk, 'RADIAL') + call expect_direct_error('bad target phase', 'GAS', 'BEAM', & + 0.40_rk, 1.0_rk, 0.0_rk, 'RADIAL') + call expect_direct_error('bad time window', 'GAS', 'SOLID', & + 0.40_rk, 1.0_rk, -1.0e-6_rk, 'RADIAL') + call expect_direct_error('bad mode', 'GAS', 'SOLID', & + 0.40_rk, 1.0_rk, 0.0_rk, 'TANGENTIAL') + call expect_too_many_regions() + +contains + + subroutine expect_input_error(filename, label) + character(len=*), intent(in) :: filename + character(len=*), intent(in) :: label + integer :: ierr + integer :: final_ierr + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for ' // label) + call sph_read_inp(filename, ierr) + if (ierr == SPH_SUCCESS) call sph_build_model(ierr) + if (ierr == SPH_SUCCESS) call fail('input unexpectedly passed: ' // label) + call sph_finalize(final_ierr) + call assert_ok(final_ierr, 'finalize failed for ' // label) + end subroutine expect_input_error + + subroutine expect_direct_error(label, source_phase, target_phase, radius, & + scale, time_window, mode_name) + character(len=*), intent(in) :: label + character(len=*), intent(in) :: source_phase + character(len=*), intent(in) :: target_phase + real(rk), intent(in) :: radius + real(rk), intent(in) :: scale + real(rk), intent(in) :: time_window + character(len=*), intent(in) :: mode_name + real(rk) :: center(SPH_NDIM) + integer :: ierr + + center = 0.0_rk + call sph_blast_reset() + call sph_blast_add_region('DIRECT_BAD', center, radius, source_phase, & + target_phase, 'NONE', scale, time_window, mode_name, ierr) + if (ierr == SPH_SUCCESS) call fail('direct check unexpectedly passed: ' // label) + end subroutine expect_direct_error + + subroutine expect_too_many_regions() + real(rk) :: center(SPH_NDIM) + character(len=16) :: name + integer :: i + integer :: ierr + + center = 0.0_rk + call sph_blast_reset() + do i = 1, SPH_MAX_REGIONS + write(name, '(A,I0)') 'REGION_', i + call sph_blast_add_region(name, center, 0.40_rk, 'GAS', & + 'SOLID', 'NONE', 1.0_rk, 0.0_rk, 'RADIAL', ierr) + call assert_ok(ierr, 'failed before Blast region limit') + end do + call sph_blast_add_region('REGION_OVERFLOW', center, 0.40_rk, 'GAS', & + 'SOLID', 'NONE', 1.0_rk, 0.0_rk, 'RADIAL', ierr) + if (ierr == SPH_SUCCESS) call fail('Blast region overflow unexpectedly passed') + end subroutine expect_too_many_regions + + subroutine assert_ok(ierr_value, message) + integer, intent(in) :: ierr_value + character(len=*), intent(in) :: message + + if (ierr_value /= SPH_SUCCESS) call fail(message) + end subroutine assert_ok + + subroutine fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_input_blast_region_errors_071 diff --git a/todo.md b/todo.md index cfc943d..249798f 100644 --- a/todo.md +++ b/todo.md @@ -33,29 +33,29 @@ ## 阶段 B:blast region 输入稳定化和多区域控制 -- [ ] 复核现有 `*SPHLITE BLAST REGION` 关键词字段。 -- [ ] 明确 0.7.1 多 blast region 的输入语义。 -- [ ] 明确 blast region 名称唯一性规则。 -- [ ] 明确重复 blast region 名称的 error 路径。 -- [ ] 明确 blast region 最大数量超过上限的 error 路径。 -- [ ] 明确 `ENABLED` 或等价启停字段的默认值。 -- [ ] 明确源 phase 默认值仍保持 0.7.0 行为。 -- [ ] 明确目标 phase 默认值仍保持 0.7.0 行为。 -- [ ] 明确 `TARGET SET` 缺失时继续报 error。 -- [ ] 明确空 target set 的 warning 或 no-op 规则。 -- [ ] 明确中心坐标必须为有限值。 -- [ ] 明确半径必须为正有限值。 -- [ ] 明确载荷比例系数必须为有限值。 -- [ ] 明确时间窗必须为非负有限值。 -- [ ] 明确未知 source phase 的 error 路径。 -- [ ] 明确未知 target phase 的 error 路径。 -- [ ] 明确未知 projection mode 的 error 路径。 -- [ ] 支持同一输入文件中读取多个 blast region。 -- [ ] 保持单 region 0.7.0 输入样例兼容。 -- [ ] 新增 `input_blast_multiregion` 测试。 -- [ ] 新增 `input_blast_region_errors_071` 测试。 -- [ ] 将 0.7.1 blast 输入测试接入 CTest。 -- [ ] 准备阶段 B 本地提交说明。 +- [x] 复核现有 `*SPHLITE BLAST REGION` 关键词字段。 +- [x] 明确 0.7.1 多 blast region 的输入语义。 +- [x] 明确 blast region 名称唯一性规则。 +- [x] 明确重复 blast region 名称的 error 路径。 +- [x] 明确 blast region 最大数量超过上限的 error 路径。 +- [x] 明确 `ENABLED` 或等价启停字段的默认值。 +- [x] 明确源 phase 默认值仍保持 0.7.0 行为。 +- [x] 明确目标 phase 默认值仍保持 0.7.0 行为。 +- [x] 明确 `TARGET SET` 缺失时继续报 error。 +- [x] 明确空 target set 的 warning 或 no-op 规则。 +- [x] 明确中心坐标必须为有限值。 +- [x] 明确半径必须为正有限值。 +- [x] 明确载荷比例系数必须为有限值。 +- [x] 明确时间窗必须为非负有限值。 +- [x] 明确未知 source phase 的 error 路径。 +- [x] 明确未知 target phase 的 error 路径。 +- [x] 明确未知 projection mode 的 error 路径。 +- [x] 支持同一输入文件中读取多个 blast region。 +- [x] 保持单 region 0.7.0 输入样例兼容。 +- [x] 新增 `input_blast_multiregion` 测试。 +- [x] 新增 `input_blast_region_errors_071` 测试。 +- [x] 将 0.7.1 blast 输入测试接入 CTest。 +- [x] 准备阶段 B 本地提交说明。 ## 阶段 C:源项快照、目标筛选和多区域诊断