From 731e27df6752e55f193c4ccf30e004e68ec63583 Mon Sep 17 00:00:00 2001 From: Codex Date: Sun, 5 Jul 2026 17:13:31 +0800 Subject: [PATCH] Implement CCLite 0.1.6 diagnostics checker --- .gitignore | 1 + CMakeLists.txt | 34 +++- Python/checkers/check_v010_empty_coupling.py | 159 ++++++++++++++++++ Python/checkers/common_csv.py | 33 ++++ .../checkers/verification_report_schema.json | 25 +++ cases/v0_1_ipc_empty_coupling/README.md | 12 +- cases/v0_1_ipc_empty_coupling/cclite.inp | 30 ++++ .../expected_outputs.md | 10 ++ cases/v0_1_ipc_empty_coupling/mock_fem.inp | 2 + cases/v0_1_ipc_empty_coupling/mock_sph.inp | 2 + src/app/cclite_main.f90 | 2 +- src/common/ccl_version.f90 | 4 +- src/controller/ccl_controller.f90 | 123 ++++++++++---- src/diagnostics/ccl_diagnostics.f90 | 149 ++++++++++++++++ todo.md | 18 +- 15 files changed, 555 insertions(+), 49 deletions(-) create mode 100644 Python/checkers/check_v010_empty_coupling.py create mode 100644 Python/checkers/common_csv.py create mode 100644 Python/checkers/verification_report_schema.json create mode 100644 cases/v0_1_ipc_empty_coupling/cclite.inp create mode 100644 cases/v0_1_ipc_empty_coupling/expected_outputs.md create mode 100644 cases/v0_1_ipc_empty_coupling/mock_fem.inp create mode 100644 cases/v0_1_ipc_empty_coupling/mock_sph.inp create mode 100644 src/diagnostics/ccl_diagnostics.f90 diff --git a/.gitignore b/.gitignore index aa5cff4..9af1ce7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ build*/ *.log *.tmp __pycache__/ +.venv/ *.pyc *.csv *.vtk diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f3bb33..25ad53b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,23 @@ cmake_minimum_required(VERSION 3.20) -project(CCLite VERSION 0.1.5 LANGUAGES C Fortran) +project(CCLite VERSION 0.1.6 LANGUAGES C Fortran) set(CMAKE_Fortran_STANDARD 2018) set(CMAKE_Fortran_STANDARD_REQUIRED ON) enable_testing() +set(CCLITE_PYTHON_EXECUTABLE "" CACHE FILEPATH "Python interpreter for CCLite checker tests") +if(CCLITE_PYTHON_EXECUTABLE) + set(Python3_EXECUTABLE "${CCLITE_PYTHON_EXECUTABLE}") +endif() +find_package(Python3 COMPONENTS Interpreter) + set(CCL_COMMON_SOURCES src/common/ccl_version.f90 src/common/ccl_errors.f90 src/common/ccl_log.f90 + src/diagnostics/ccl_diagnostics.f90 src/case/ccl_string_utils.f90 src/case/ccl_case_types.f90 src/case/ccl_inp_parser.f90 @@ -102,3 +109,28 @@ add_test(NAME dry_run_one_step add_test(NAME dry_run_100_step COMMAND cclite dry-run ${CMAKE_SOURCE_DIR}/tests/data/v010_valid.inp ) + +if(Python3_Interpreter_FOUND) + add_test(NAME verify_v010_empty_coupling + COMMAND ${Python3_EXECUTABLE} + ${CMAKE_SOURCE_DIR}/Python/checkers/check_v010_empty_coupling.py + --case-id V010_EMPTY_COUPLING + --input ${CMAKE_SOURCE_DIR}/tests/data/v010_valid.inp + --output-dir ${CMAKE_BINARY_DIR}/output/v010_empty_coupling + --report ${CMAKE_BINARY_DIR}/output/v010_empty_coupling/verification_report.json + --expected-steps 100 + ) + set_tests_properties(verify_v010_empty_coupling PROPERTIES DEPENDS dry_run_100_step) + + add_test(NAME diagnostics_regression_headers + COMMAND ${Python3_EXECUTABLE} + ${CMAKE_SOURCE_DIR}/Python/checkers/check_v010_empty_coupling.py + --case-id V010_EMPTY_COUPLING + --input ${CMAKE_SOURCE_DIR}/tests/data/v010_valid.inp + --output-dir ${CMAKE_BINARY_DIR}/output/v010_empty_coupling + --report ${CMAKE_BINARY_DIR}/output/v010_empty_coupling/verification_report_headers.json + --expected-steps 100 + --headers-only + ) + set_tests_properties(diagnostics_regression_headers PROPERTIES DEPENDS dry_run_100_step) +endif() diff --git a/Python/checkers/check_v010_empty_coupling.py b/Python/checkers/check_v010_empty_coupling.py new file mode 100644 index 0000000..2c9caf9 --- /dev/null +++ b/Python/checkers/check_v010_empty_coupling.py @@ -0,0 +1,159 @@ +from __future__ import annotations + +import argparse +import json +from pathlib import Path + +from common_csv import as_float, as_int, read_required_csv + + +IPC_HEADERS = [ + "step_id", + "solver_id", + "command_id", + "command_seq", + "ack_seq", + "worker_state", + "heartbeat_seq", + "elapsed_ms", + "error_code", +] + +FORCE_HEADERS = [ + "step_id", + "sph_fx", + "sph_fy", + "sph_fz", + "fem_fx", + "fem_fy", + "fem_fz", + "total_fx", + "total_fy", + "total_fz", +] + + +def build_report(args: argparse.Namespace) -> dict: + output_dir = Path(args.output_dir) + ipc_path = output_dir / "ipc_report.csv" + force_path = output_dir / "force_balance.csv" + log_path = output_dir / "run.log" + + failed: list[str] = [] + metrics: dict[str, int | float] = {} + + try: + _, ipc_rows = read_required_csv(ipc_path, IPC_HEADERS) + _, force_rows = read_required_csv(force_path, FORCE_HEADERS) + except AssertionError as exc: + ipc_rows = [] + force_rows = [] + failed.append(str(exc)) + + if not log_path.exists(): + failed.append(f"missing log file: {log_path}") + + if args.headers_only: + return make_report(args, failed, metrics, ipc_path, force_path, log_path) + + if not ipc_rows: + failed.append("ipc_report.csv has no data rows") + if not force_rows: + failed.append("force_balance.csv has no data rows") + + stop_rows = 0 + for index, row in enumerate(ipc_rows, start=1): + try: + command_seq = as_int(row, "command_seq") + ack_seq = as_int(row, "ack_seq") + command_id = as_int(row, "command_id") + worker_state = as_int(row, "worker_state") + heartbeat_seq = as_int(row, "heartbeat_seq") + elapsed_ms = as_float(row, "elapsed_ms") + error_code = as_int(row, "error_code") + except AssertionError as exc: + failed.append(f"ipc row {index}: {exc}") + continue + + if command_seq != ack_seq: + failed.append(f"ipc row {index}: seq/ack mismatch {command_seq}/{ack_seq}") + if error_code != 0: + failed.append(f"ipc row {index}: nonzero error_code {error_code}") + if elapsed_ms < 0.0: + failed.append(f"ipc row {index}: negative elapsed_ms") + if heartbeat_seq < 0: + failed.append(f"ipc row {index}: negative heartbeat") + if command_id == 99: + stop_rows += 1 + if worker_state != 6: + failed.append(f"ipc row {index}: STOP did not leave worker STOPPED") + + if stop_rows != 2: + failed.append(f"expected two STOP rows, got {stop_rows}") + + seen_steps: set[int] = set() + for index, row in enumerate(force_rows, start=1): + try: + step_id = as_int(row, "step_id") + values = [as_float(row, key) for key in FORCE_HEADERS if key != "step_id"] + except AssertionError as exc: + failed.append(f"force row {index}: {exc}") + continue + seen_steps.add(step_id) + for key, value in zip(FORCE_HEADERS[1:], values): + if abs(value) > 1.0e-12: + failed.append(f"force row {index}: {key} expected 0, got {value}") + + expected_steps = set(range(1, args.expected_steps + 1)) + if seen_steps != expected_steps: + failed.append(f"force steps mismatch: expected 1..{args.expected_steps}, got {sorted(seen_steps)}") + + metrics["ipc_rows"] = len(ipc_rows) + metrics["force_rows"] = len(force_rows) + metrics["stop_rows"] = stop_rows + metrics["expected_steps"] = args.expected_steps + return make_report(args, failed, metrics, ipc_path, force_path, log_path) + + +def make_report( + args: argparse.Namespace, + failed: list[str], + metrics: dict, + ipc_path: Path, + force_path: Path, + log_path: Path, +) -> dict: + return { + "case_id": args.case_id, + "status": "PASS" if not failed else "FAIL", + "metrics": metrics, + "failed_checks": failed, + "input": str(Path(args.input)), + "output_files": { + "run_log": str(log_path), + "ipc_report": str(ipc_path), + "force_balance": str(force_path), + }, + } + + +def main() -> int: + parser = argparse.ArgumentParser() + parser.add_argument("--case-id", required=True) + parser.add_argument("--input", required=True) + parser.add_argument("--output-dir", required=True) + parser.add_argument("--report", required=True) + parser.add_argument("--expected-steps", type=int, default=100) + parser.add_argument("--headers-only", action="store_true") + args = parser.parse_args() + + report = build_report(args) + report_path = Path(args.report) + report_path.parent.mkdir(parents=True, exist_ok=True) + report_path.write_text(json.dumps(report, ensure_ascii=False, indent=2) + "\n", encoding="utf-8") + print(f"{report['case_id']} {report['status']} -> {report_path}") + return 0 if report["status"] == "PASS" else 1 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/Python/checkers/common_csv.py b/Python/checkers/common_csv.py new file mode 100644 index 0000000..482e4e1 --- /dev/null +++ b/Python/checkers/common_csv.py @@ -0,0 +1,33 @@ +from __future__ import annotations + +import csv +from pathlib import Path + + +def read_required_csv(path: Path, required_headers: list[str]) -> tuple[list[str], list[dict[str, str]]]: + if not path.exists(): + raise AssertionError(f"missing CSV file: {path}") + + with path.open("r", encoding="utf-8", newline="") as stream: + reader = csv.DictReader(stream) + headers = list(reader.fieldnames or []) + missing = [name for name in required_headers if name not in headers] + if missing: + raise AssertionError(f"{path.name} missing headers: {', '.join(missing)}") + rows = list(reader) + + return headers, rows + + +def as_int(row: dict[str, str], key: str) -> int: + try: + return int(row[key]) + except Exception as exc: + raise AssertionError(f"invalid integer in {key}: {row.get(key)!r}") from exc + + +def as_float(row: dict[str, str], key: str) -> float: + try: + return float(row[key]) + except Exception as exc: + raise AssertionError(f"invalid float in {key}: {row.get(key)!r}") from exc diff --git a/Python/checkers/verification_report_schema.json b/Python/checkers/verification_report_schema.json new file mode 100644 index 0000000..9029a85 --- /dev/null +++ b/Python/checkers/verification_report_schema.json @@ -0,0 +1,25 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "title": "CCLite verification report", + "type": "object", + "required": ["case_id", "status", "metrics", "failed_checks", "input", "output_files"], + "properties": { + "case_id": { "type": "string" }, + "status": { "type": "string", "enum": ["PASS", "FAIL"] }, + "metrics": { "type": "object" }, + "failed_checks": { + "type": "array", + "items": { "type": "string" } + }, + "input": { "type": "string" }, + "output_files": { + "type": "object", + "required": ["run_log", "ipc_report", "force_balance"], + "properties": { + "run_log": { "type": "string" }, + "ipc_report": { "type": "string" }, + "force_balance": { "type": "string" } + } + } + } +} diff --git a/cases/v0_1_ipc_empty_coupling/README.md b/cases/v0_1_ipc_empty_coupling/README.md index da49f30..97847d8 100644 --- a/cases/v0_1_ipc_empty_coupling/README.md +++ b/cases/v0_1_ipc_empty_coupling/README.md @@ -1,5 +1,13 @@ # V010_EMPTY_COUPLING -0.1.x empty coupling acceptance case. +CCLite 0.1.x 空耦合验收算例。 -The case will be filled after the `.inp` parser, IPC layer and mock workers are implemented. +该算例启动 CCLite 主控程序、mock SPH worker 和 mock FEM worker,通过 Windows shared memory 与 named event 完成 100 step 空耦合通信闭环。 + +验收输出由 `Python/checkers/check_v010_empty_coupling.py` 检查: + +1. `ipc_report.csv` 中所有命令满足 `command_seq == ack_seq`; +2. 所有命令 `error_code == 0`; +3. 两个 worker 均收到 `STOP` 并进入 `STOPPED`; +4. `force_balance.csv` 中 100 个 step 的合力均为 0; +5. checker 生成 `verification_report.json`,且 `status=PASS`。 diff --git a/cases/v0_1_ipc_empty_coupling/cclite.inp b/cases/v0_1_ipc_empty_coupling/cclite.inp new file mode 100644 index 0000000..6471bc8 --- /dev/null +++ b/cases/v0_1_ipc_empty_coupling/cclite.inp @@ -0,0 +1,30 @@ +** CCLite 0.1.x empty coupling verification case. +*CCLITE CONTROL, NAME=V010_EMPTY_COUPLING, MODE=DRY_RUN +VERSION=0.1 + +*CCLITE SOLVER, ID=SPH, KIND=SPHLITE +EXECUTABLE=mock_sph_worker.exe +INPUT=mock_sph.inp + +*CCLITE SOLVER, ID=FEM, KIND=FEMLITE +EXECUTABLE=mock_fem_worker.exe +INPUT=mock_fem.inp + +*CCLITE IPC, TYPE=WINDOWS_SHMEM +NAME_PREFIX=CCLITE_V010 +BUFFER=DOUBLE +TIMEOUT_MS=5000 + +*CCLITE TIME +START=0.0 +END=1.0e-4 +DT=1.0e-6 + +*CCLITE INTERFACE, NAME=IFACE_1 +SPH_REGION=MOCK_SPH_REGION +FEM_SURFACE=MOCK_FEM_SURFACE + +*CCLITE OUTPUT +DIRECTORY=output/v010_empty_coupling +CSV=YES +LOG=YES diff --git a/cases/v0_1_ipc_empty_coupling/expected_outputs.md b/cases/v0_1_ipc_empty_coupling/expected_outputs.md new file mode 100644 index 0000000..f1953b2 --- /dev/null +++ b/cases/v0_1_ipc_empty_coupling/expected_outputs.md @@ -0,0 +1,10 @@ +# V010_EMPTY_COUPLING 预期输出 + +本算例用于验证 0.1.x 的 Windows/gfortran/本机共享内存空耦合闭环。 + +预期输出: + +1. `run.log`:记录版本、输入文件、worker 启动命令、IPC 名称、完成状态和资源释放。 +2. `ipc_report.csv`:每条 worker 命令均满足 `command_seq == ack_seq`,`error_code == 0`。 +3. `force_balance.csv`:每个 step 的 SPH、FEM 和总合力均为 0。 +4. `verification_report.json`:Python checker 输出 `status=PASS`。 diff --git a/cases/v0_1_ipc_empty_coupling/mock_fem.inp b/cases/v0_1_ipc_empty_coupling/mock_fem.inp new file mode 100644 index 0000000..cf998ed --- /dev/null +++ b/cases/v0_1_ipc_empty_coupling/mock_fem.inp @@ -0,0 +1,2 @@ +** Mock FEM worker input for CCLite 0.1.x. +** 0.1.x exports an empty FEM facet block for IPC verification. diff --git a/cases/v0_1_ipc_empty_coupling/mock_sph.inp b/cases/v0_1_ipc_empty_coupling/mock_sph.inp new file mode 100644 index 0000000..cf9979b --- /dev/null +++ b/cases/v0_1_ipc_empty_coupling/mock_sph.inp @@ -0,0 +1,2 @@ +** Mock SPH worker input for CCLite 0.1.x. +** 0.1.x exports an empty SPH particle block for IPC verification. diff --git a/src/app/cclite_main.f90 b/src/app/cclite_main.f90 index 6e06eed..9d7a976 100644 --- a/src/app/cclite_main.f90 +++ b/src/app/cclite_main.f90 @@ -71,7 +71,7 @@ contains return end if - ierr = ccl_controller_run_empty_coupling(ccl_case) + ierr = ccl_controller_run_empty_coupling(ccl_case, trim(input_file)) end function handle_mode subroutine print_help() diff --git a/src/common/ccl_version.f90 b/src/common/ccl_version.f90 index cd517f7..127f93c 100644 --- a/src/common/ccl_version.f90 +++ b/src/common/ccl_version.f90 @@ -3,8 +3,8 @@ module ccl_version integer, parameter :: CCL_VERSION_MAJOR = 0 integer, parameter :: CCL_VERSION_MINOR = 1 - integer, parameter :: CCL_VERSION_PATCH = 5 - character(len=*), parameter :: CCL_VERSION_LABEL = "0.1.5" + integer, parameter :: CCL_VERSION_PATCH = 6 + character(len=*), parameter :: CCL_VERSION_LABEL = "0.1.6" contains diff --git a/src/controller/ccl_controller.f90 b/src/controller/ccl_controller.f90 index 6da6453..d76bbdd 100644 --- a/src/controller/ccl_controller.f90 +++ b/src/controller/ccl_controller.f90 @@ -11,6 +11,9 @@ module ccl_controller CCL_ROLE_SPH_TO_CCL_PARTICLE, ccl_data_header_init, ccl_data_header_set_count, & ccl_data_header_set_state, ccl_data_header_size, ccl_data_header_validate, & ccl_data_record_size_for_role + use ccl_diagnostics, only: CCL_Diagnostics_Type, ccl_diagnostics_close, & + ccl_diagnostics_open, ccl_diagnostics_write_force_balance, ccl_diagnostics_write_ipc, & + ccl_diagnostics_write_run use ccl_errors, only: CCL_ERROR_INPUT_INVALID_VALUE, CCL_ERROR_IPC_TIMEOUT, & CCL_ERROR_SYSTEM_INTERNAL, CCL_ERROR_WORKER_START_FAILED, CCL_ERROR_WORKER_STOP_FAILED, & CCL_SUCCESS @@ -53,11 +56,13 @@ module ccl_controller contains - integer function ccl_controller_run_empty_coupling(ccl_case) result(ierr) + integer function ccl_controller_run_empty_coupling(ccl_case, input_file) result(ierr) type(CCL_Case_Type), intent(in) :: ccl_case + character(len=*), intent(in) :: input_file type(CCL_Worker_Runtime) :: sph_worker type(CCL_Worker_Runtime) :: fem_worker + type(CCL_Diagnostics_Type) :: diag integer :: step_count integer :: step_id integer :: close_ierr @@ -70,7 +75,11 @@ contains return end if - call ccl_log_info("controller", "starting 0.1.5 empty coupling dry-run") + call ccl_diagnostics_open(diag, ccl_case%output%directory, ccl_case%name, input_file, ierr) + if (ierr /= CCL_SUCCESS) return + + call ccl_log_info("controller", "starting 0.1.6 empty coupling dry-run") + call ccl_diagnostics_write_run(diag, "INFO", "controller", "starting empty coupling dry-run") call init_worker(sph_worker, ccl_case, CCL_CASE_SOLVER_SPH, ierr) if (ierr /= CCL_SUCCESS) goto 900 call init_worker(fem_worker, ccl_case, CCL_CASE_SOLVER_FEM, ierr) @@ -80,10 +89,12 @@ contains if (ierr /= CCL_SUCCESS) goto 900 call create_worker_resources(fem_worker, ierr) if (ierr /= CCL_SUCCESS) goto 900 + call log_worker_resources(diag, sph_worker) + call log_worker_resources(diag, fem_worker) - call start_worker(sph_worker, ierr) + call start_worker(sph_worker, diag, ierr) if (ierr /= CCL_SUCCESS) goto 900 - call start_worker(fem_worker, ierr) + call start_worker(fem_worker, diag, ierr) if (ierr /= CCL_SUCCESS) goto 900 call wait_worker_ready(sph_worker, ierr) @@ -91,38 +102,42 @@ contains call wait_worker_ready(fem_worker, ierr) if (ierr /= CCL_SUCCESS) goto 900 - call send_startup_sequence(sph_worker, ccl_case%time%dt, ierr) + call send_startup_sequence(sph_worker, ccl_case%time%dt, diag, ierr) if (ierr /= CCL_SUCCESS) goto 900 - call send_startup_sequence(fem_worker, ccl_case%time%dt, ierr) + call send_startup_sequence(fem_worker, ccl_case%time%dt, diag, ierr) if (ierr /= CCL_SUCCESS) goto 900 do step_id = 1, step_count - call run_empty_step(sph_worker, fem_worker, step_id, ccl_case%time%dt, ierr) + call run_empty_step(sph_worker, fem_worker, step_id, ccl_case%time%dt, diag, ierr) if (ierr /= CCL_SUCCESS) goto 900 end do - call send_worker_command(sph_worker, CCL_CMD_WRITE_OUTPUT, step_count, ccl_case%time%dt, ierr) + call send_worker_command(sph_worker, CCL_CMD_WRITE_OUTPUT, step_count, ccl_case%time%dt, diag, ierr) if (ierr /= CCL_SUCCESS) goto 900 - call send_worker_command(fem_worker, CCL_CMD_WRITE_OUTPUT, step_count, ccl_case%time%dt, ierr) + call send_worker_command(fem_worker, CCL_CMD_WRITE_OUTPUT, step_count, ccl_case%time%dt, diag, ierr) if (ierr /= CCL_SUCCESS) goto 900 - call stop_worker(sph_worker, ierr) + call stop_worker(sph_worker, diag, ierr) if (ierr /= CCL_SUCCESS) goto 900 - call stop_worker(fem_worker, ierr) + call stop_worker(fem_worker, diag, ierr) if (ierr /= CCL_SUCCESS) goto 900 write(msg, '(a,i0)') "empty coupling dry-run completed, steps=", step_count call ccl_log_info("controller", trim(msg)) + call ccl_diagnostics_write_run(diag, "INFO", "controller", trim(msg)) 900 continue if (ierr /= CCL_SUCCESS) then write(msg, '(a,i0)') "empty coupling failed, ierr=", ierr call ccl_log_error("controller", trim(msg)) + call ccl_diagnostics_write_run(diag, "ERROR", "controller", trim(msg)) call terminate_worker_if_running(sph_worker) call terminate_worker_if_running(fem_worker) end if call close_worker(sph_worker, close_ierr) call close_worker(fem_worker, close_ierr) + call ccl_diagnostics_write_run(diag, "INFO", "controller", "resources released") + call ccl_diagnostics_close(diag) end function ccl_controller_run_empty_coupling subroutine init_worker(worker, ccl_case, solver_slot, ierr) @@ -200,13 +215,15 @@ contains call ccl_event_create(worker%ack_event_name, .false., worker%ack_event, ierr) end subroutine create_worker_resources - subroutine start_worker(worker, ierr) + subroutine start_worker(worker, diag, ierr) type(CCL_Worker_Runtime), intent(inout) :: worker + type(CCL_Diagnostics_Type), intent(inout) :: diag integer, intent(out) :: ierr character(len=1024) :: command_line call build_worker_command_line(worker, command_line) call ccl_log_info("controller", "starting " // trim(worker%solver_name) // " worker") + call ccl_diagnostics_write_run(diag, "INFO", "worker_command", trim(command_line)) call ccl_process_start(trim(command_line), worker%process, ierr) worker%started = (ierr == CCL_SUCCESS) end subroutine start_worker @@ -226,28 +243,30 @@ contains call ccl_log_info("controller", trim(worker%solver_name) // " worker ready") end subroutine wait_worker_ready - subroutine send_startup_sequence(worker, dt, ierr) + subroutine send_startup_sequence(worker, dt, diag, ierr) type(CCL_Worker_Runtime), intent(inout) :: worker real(8), intent(in) :: dt + type(CCL_Diagnostics_Type), intent(inout) :: diag integer, intent(out) :: ierr - call send_worker_command(worker, CCL_CMD_INIT, 0, dt, ierr) + call send_worker_command(worker, CCL_CMD_INIT, 0, dt, diag, ierr) if (ierr /= CCL_SUCCESS) return - call send_worker_command(worker, CCL_CMD_READ_INPUT, 0, dt, ierr) + call send_worker_command(worker, CCL_CMD_READ_INPUT, 0, dt, diag, ierr) if (ierr /= CCL_SUCCESS) return - call send_worker_command(worker, CCL_CMD_BUILD_MODEL, 0, dt, ierr) + call send_worker_command(worker, CCL_CMD_BUILD_MODEL, 0, dt, diag, ierr) end subroutine send_startup_sequence - subroutine run_empty_step(sph_worker, fem_worker, step_id, dt, ierr) + subroutine run_empty_step(sph_worker, fem_worker, step_id, dt, diag, ierr) type(CCL_Worker_Runtime), intent(inout) :: sph_worker type(CCL_Worker_Runtime), intent(inout) :: fem_worker integer, intent(in) :: step_id real(8), intent(in) :: dt + type(CCL_Diagnostics_Type), intent(inout) :: diag integer, intent(out) :: ierr - call send_worker_command(sph_worker, CCL_CMD_EXPORT_INTERFACE, step_id, dt, ierr) + call send_worker_command(sph_worker, CCL_CMD_EXPORT_INTERFACE, step_id, dt, diag, ierr) if (ierr /= CCL_SUCCESS) return - call send_worker_command(fem_worker, CCL_CMD_EXPORT_INTERFACE, step_id, dt, ierr) + call send_worker_command(fem_worker, CCL_CMD_EXPORT_INTERFACE, step_id, dt, diag, ierr) if (ierr /= CCL_SUCCESS) return call validate_export_header(sph_worker, step_id, ierr) @@ -260,41 +279,60 @@ contains call prepare_empty_load(fem_worker, step_id, ierr) if (ierr /= CCL_SUCCESS) return - call send_worker_command(sph_worker, CCL_CMD_IMPORT_LOADS, step_id, dt, ierr) + call send_worker_command(sph_worker, CCL_CMD_IMPORT_LOADS, step_id, dt, diag, ierr) if (ierr /= CCL_SUCCESS) return - call send_worker_command(fem_worker, CCL_CMD_IMPORT_LOADS, step_id, dt, ierr) + call send_worker_command(fem_worker, CCL_CMD_IMPORT_LOADS, step_id, dt, diag, ierr) if (ierr /= CCL_SUCCESS) return - call send_worker_command(sph_worker, CCL_CMD_ADVANCE, step_id, dt, ierr) + call send_worker_command(sph_worker, CCL_CMD_ADVANCE, step_id, dt, diag, ierr) if (ierr /= CCL_SUCCESS) return - call send_worker_command(fem_worker, CCL_CMD_ADVANCE, step_id, dt, ierr) + call send_worker_command(fem_worker, CCL_CMD_ADVANCE, step_id, dt, diag, ierr) + if (ierr /= CCL_SUCCESS) return + call ccl_diagnostics_write_force_balance(diag, step_id) end subroutine run_empty_step - subroutine send_worker_command(worker, command_id, step_id, dt, ierr) + subroutine send_worker_command(worker, command_id, step_id, dt, diag, ierr) type(CCL_Worker_Runtime), intent(inout) :: worker integer(c_int32_t), intent(in) :: command_id integer, intent(in) :: step_id real(8), intent(in) :: dt + type(CCL_Diagnostics_Type), intent(inout) :: diag integer, intent(out) :: ierr logical :: is_running + integer :: process_ierr + real(8) :: start_time + real(8) :: end_time + real(8) :: elapsed_ms + call cpu_time(start_time) call ccl_event_reset(worker%ack_event, ierr) - if (ierr /= CCL_SUCCESS) return + if (ierr /= CCL_SUCCESS) goto 800 call ccl_command_dispatch(worker%command, command_id, int(step_id, c_int64_t), & real(dt, c_double), ierr) - if (ierr /= CCL_SUCCESS) return + if (ierr /= CCL_SUCCESS) goto 800 call ccl_event_signal(worker%command_event, ierr) - if (ierr /= CCL_SUCCESS) return + if (ierr /= CCL_SUCCESS) goto 800 call ccl_event_wait(worker%ack_event, worker%timeout_ms, ierr) if (ierr == CCL_ERROR_IPC_TIMEOUT) then - call ccl_process_is_running(worker%process, is_running, ierr) - if (ierr == CCL_SUCCESS .and. .not. is_running) ierr = CCL_ERROR_WORKER_STOP_FAILED - return + call ccl_process_is_running(worker%process, is_running, process_ierr) + if (process_ierr == CCL_SUCCESS .and. .not. is_running) then + ierr = CCL_ERROR_WORKER_STOP_FAILED + else + ierr = CCL_ERROR_IPC_TIMEOUT + end if + goto 800 end if - if (ierr /= CCL_SUCCESS) return + if (ierr /= CCL_SUCCESS) goto 800 call ccl_command_check_ack(worker%command, ierr) - if (ierr /= CCL_SUCCESS) return + if (ierr /= CCL_SUCCESS) goto 800 if (worker%command%error_code /= CCL_SUCCESS) ierr = worker%command%error_code + +800 continue + call cpu_time(end_time) + elapsed_ms = max(0.0d0, (end_time - start_time) * 1000.0d0) + call ccl_diagnostics_write_ipc(diag, int(worker%command%step_id), int(worker%solver_id), & + int(command_id), worker%command%command_seq, worker%command%ack_seq, & + int(worker%command%worker_state), worker%command%heartbeat_seq, elapsed_ms, ierr) end subroutine send_worker_command subroutine validate_export_header(worker, step_id, ierr) @@ -331,14 +369,15 @@ contains call ccl_data_header_set_state(worker%load_header, CCL_BUFFER_READY, ierr) end subroutine prepare_empty_load - subroutine stop_worker(worker, ierr) + subroutine stop_worker(worker, diag, ierr) type(CCL_Worker_Runtime), intent(inout) :: worker + type(CCL_Diagnostics_Type), intent(inout) :: diag integer, intent(out) :: ierr integer :: exit_code ierr = CCL_SUCCESS if (.not. worker%started) return - call send_worker_command(worker, CCL_CMD_STOP, int(worker%command%step_id), 0.0d0, ierr) + call send_worker_command(worker, CCL_CMD_STOP, int(worker%command%step_id), 0.0d0, diag, ierr) if (ierr /= CCL_SUCCESS) return call ccl_process_wait(worker%process, worker%timeout_ms, exit_code, ierr) if (ierr /= CCL_SUCCESS) return @@ -346,6 +385,22 @@ contains worker%started = .false. end subroutine stop_worker + subroutine log_worker_resources(diag, worker) + type(CCL_Diagnostics_Type), intent(inout) :: diag + type(CCL_Worker_Runtime), intent(in) :: worker + + call ccl_diagnostics_write_run(diag, "INFO", "ipc", trim(worker%solver_name) // & + " command=" // trim(worker%command_name)) + call ccl_diagnostics_write_run(diag, "INFO", "ipc", trim(worker%solver_name) // & + " command_event=" // trim(worker%command_event_name)) + call ccl_diagnostics_write_run(diag, "INFO", "ipc", trim(worker%solver_name) // & + " ack_event=" // trim(worker%ack_event_name)) + call ccl_diagnostics_write_run(diag, "INFO", "ipc", trim(worker%solver_name) // & + " export=" // trim(worker%export_name)) + call ccl_diagnostics_write_run(diag, "INFO", "ipc", trim(worker%solver_name) // & + " load=" // trim(worker%load_name)) + end subroutine log_worker_resources + subroutine terminate_worker_if_running(worker) type(CCL_Worker_Runtime), intent(inout) :: worker integer :: ierr diff --git a/src/diagnostics/ccl_diagnostics.f90 b/src/diagnostics/ccl_diagnostics.f90 new file mode 100644 index 0000000..45108ff --- /dev/null +++ b/src/diagnostics/ccl_diagnostics.f90 @@ -0,0 +1,149 @@ +module ccl_diagnostics + use iso_fortran_env, only: error_unit + use ccl_errors, only: CCL_ERROR_SYSTEM_INTERNAL, CCL_SUCCESS + use ccl_version, only: CCL_VERSION_LABEL + implicit none + + type :: CCL_Diagnostics_Type + character(len=512) :: output_dir = "" + integer :: log_unit = -1 + integer :: ipc_unit = -1 + integer :: force_unit = -1 + logical :: is_open = .false. + end type CCL_Diagnostics_Type + +contains + + subroutine ccl_diagnostics_open(diag, output_dir, case_id, input_file, ierr) + type(CCL_Diagnostics_Type), intent(out) :: diag + character(len=*), intent(in) :: output_dir + character(len=*), intent(in) :: case_id + character(len=*), intent(in) :: input_file + integer, intent(out) :: ierr + integer :: ios + + diag = CCL_Diagnostics_Type() + diag%output_dir = trim(output_dir) + call ensure_directory(diag%output_dir, ierr) + if (ierr /= CCL_SUCCESS) return + + open(newunit=diag%log_unit, file=join_path(diag%output_dir, "run.log"), status="replace", & + action="write", encoding="UTF-8", iostat=ios) + if (ios /= 0) then + ierr = CCL_ERROR_SYSTEM_INTERNAL + return + end if + + open(newunit=diag%ipc_unit, file=join_path(diag%output_dir, "ipc_report.csv"), status="replace", & + action="write", encoding="UTF-8", iostat=ios) + if (ios /= 0) then + ierr = CCL_ERROR_SYSTEM_INTERNAL + return + end if + + open(newunit=diag%force_unit, file=join_path(diag%output_dir, "force_balance.csv"), status="replace", & + action="write", encoding="UTF-8", iostat=ios) + if (ios /= 0) then + ierr = CCL_ERROR_SYSTEM_INTERNAL + return + end if + + diag%is_open = .true. + write(diag%ipc_unit, '(a)') "step_id,solver_id,command_id,command_seq,ack_seq,worker_state," // & + "heartbeat_seq,elapsed_ms,error_code" + write(diag%force_unit, '(a)') "step_id,sph_fx,sph_fy,sph_fz,fem_fx,fem_fy,fem_fz,total_fx,total_fy,total_fz" + call ccl_diagnostics_write_run(diag, "INFO", "run", "version=" // CCL_VERSION_LABEL) + call ccl_diagnostics_write_run(diag, "INFO", "run", "case_id=" // trim(case_id)) + call ccl_diagnostics_write_run(diag, "INFO", "run", "input=" // trim(input_file)) + ierr = CCL_SUCCESS + end subroutine ccl_diagnostics_open + + subroutine ccl_diagnostics_write_run(diag, level, module_name, message) + type(CCL_Diagnostics_Type), intent(inout) :: diag + character(len=*), intent(in) :: level + character(len=*), intent(in) :: module_name + character(len=*), intent(in) :: message + + if (.not. diag%is_open .or. diag%log_unit == -1) return + write(diag%log_unit, '(a)') "[" // trim(level) // "] [" // trim(module_name) // "] " // trim(message) + flush(diag%log_unit) + end subroutine ccl_diagnostics_write_run + + subroutine ccl_diagnostics_write_ipc(diag, step_id, solver_id, command_id, command_seq, ack_seq, & + worker_state, heartbeat_seq, elapsed_ms, error_code) + type(CCL_Diagnostics_Type), intent(inout) :: diag + integer, intent(in) :: step_id + integer, intent(in) :: solver_id + integer, intent(in) :: command_id + integer(8), intent(in) :: command_seq + integer(8), intent(in) :: ack_seq + integer, intent(in) :: worker_state + integer(8), intent(in) :: heartbeat_seq + real(8), intent(in) :: elapsed_ms + integer, intent(in) :: error_code + + if (.not. diag%is_open .or. diag%ipc_unit == -1) return + write(diag%ipc_unit, '(i0,",",i0,",",i0,",",i0,",",i0,",",i0,",",i0,",",f10.3,",",i0)') & + step_id, solver_id, command_id, command_seq, ack_seq, worker_state, heartbeat_seq, & + elapsed_ms, error_code + flush(diag%ipc_unit) + end subroutine ccl_diagnostics_write_ipc + + subroutine ccl_diagnostics_write_force_balance(diag, step_id) + type(CCL_Diagnostics_Type), intent(inout) :: diag + integer, intent(in) :: step_id + + if (.not. diag%is_open .or. diag%force_unit == -1) return + write(diag%force_unit, '(i0,9(",",es16.8))') step_id, 0.0d0, 0.0d0, 0.0d0, & + 0.0d0, 0.0d0, 0.0d0, 0.0d0, 0.0d0, 0.0d0 + flush(diag%force_unit) + end subroutine ccl_diagnostics_write_force_balance + + subroutine ccl_diagnostics_close(diag) + type(CCL_Diagnostics_Type), intent(inout) :: diag + + if (diag%log_unit /= -1) close(diag%log_unit) + if (diag%ipc_unit /= -1) close(diag%ipc_unit) + if (diag%force_unit /= -1) close(diag%force_unit) + diag%log_unit = -1 + diag%ipc_unit = -1 + diag%force_unit = -1 + diag%is_open = .false. + end subroutine ccl_diagnostics_close + + subroutine ensure_directory(path, ierr) + character(len=*), intent(in) :: path + integer, intent(out) :: ierr + integer :: cmdstat + integer :: exitstat + character(len=1200) :: command + + if (len_trim(path) == 0) then + ierr = CCL_ERROR_SYSTEM_INTERNAL + return + end if + + command = 'cmd /c if not exist "' // trim(path) // '" mkdir "' // trim(path) // '"' + call execute_command_line(trim(command), exitstat=exitstat, cmdstat=cmdstat) + if (cmdstat /= 0 .or. exitstat /= 0) then + write(error_unit, '(a)') "failed to create output directory: " // trim(path) + ierr = CCL_ERROR_SYSTEM_INTERNAL + return + end if + ierr = CCL_SUCCESS + end subroutine ensure_directory + + character(len=1024) function join_path(directory, leaf) result(path) + character(len=*), intent(in) :: directory + character(len=*), intent(in) :: leaf + integer :: n + + n = len_trim(directory) + if (n > 0 .and. (directory(n:n) == "/" .or. directory(n:n) == "\")) then + path = trim(directory) // trim(leaf) + else + path = trim(directory) // "/" // trim(leaf) + end if + end function join_path + +end module ccl_diagnostics diff --git a/todo.md b/todo.md index 1b8d400..8f24a9b 100644 --- a/todo.md +++ b/todo.md @@ -219,31 +219,31 @@ 目标:形成可自动判定的 `V010_EMPTY_COUPLING` 验证闭环。 -- [ ] T0161 实现 `run.log` 标准输出。 +- [x] T0161 实现 `run.log` 标准输出。 完成判据:记录版本、输入、worker 命令、IPC 名称、错误码和资源释放。 -- [ ] T0162 实现 `ipc_report.csv`。 +- [x] T0162 实现 `ipc_report.csv`。 完成判据:每步输出 solver id、command id、seq、ack、worker state、heartbeat、elapsed 和 error。 -- [ ] T0163 实现 `force_balance.csv`。 +- [x] T0163 实现 `force_balance.csv`。 完成判据:0.1.x 空耦合每步输出 SPH/FEM 总力为 0。 -- [ ] T0164 建立 `Python/checkers/`。 +- [x] T0164 建立 `Python/checkers/`。 完成判据:目录中有 checker 入口和公共 CSV 读取工具。 -- [ ] T0165 定义 `verification_report.json` schema。 +- [x] T0165 定义 `verification_report.json` schema。 完成判据:包含 case id、status、metrics、failed checks、输入和输出文件。 -- [ ] T0166 实现 `V010_EMPTY_COUPLING` checker。 +- [x] T0166 实现 `V010_EMPTY_COUPLING` checker。 完成判据:检查 seq/ack、step id、timeout、worker state、空载荷和退出状态。 -- [ ] T0167 建立 `cases/v0_1_ipc_empty_coupling/`。 +- [x] T0167 建立 `cases/v0_1_ipc_empty_coupling/`。 完成判据:包含 CCLite `.inp`、mock 输入说明和预期输出说明。 -- [ ] T0168 集成 checker 到本地测试命令。 +- [x] T0168 集成 checker 到本地测试命令。 完成判据:运行测试后自动生成 `verification_report.json`。 -- [ ] T0169 增加诊断回归测试。 +- [x] T0169 增加诊断回归测试。 完成判据:CSV 表头变化或关键字段缺失会导致测试失败。 # 9. 0.1.7 真实 Worker 最小接入