Implement CCLite 0.1.7 real worker audit
This commit is contained in:
@@ -3,8 +3,8 @@ module ccl_version
|
||||
|
||||
integer, parameter :: CCL_VERSION_MAJOR = 0
|
||||
integer, parameter :: CCL_VERSION_MINOR = 1
|
||||
integer, parameter :: CCL_VERSION_PATCH = 6
|
||||
character(len=*), parameter :: CCL_VERSION_LABEL = "0.1.6"
|
||||
integer, parameter :: CCL_VERSION_PATCH = 7
|
||||
character(len=*), parameter :: CCL_VERSION_LABEL = "0.1.7"
|
||||
|
||||
contains
|
||||
|
||||
|
||||
@@ -464,10 +464,10 @@ contains
|
||||
character(len=*), intent(out) :: command_line
|
||||
|
||||
command_line = trim(quote_argument(worker%executable)) // " --cclite-worker --solver-id " // &
|
||||
trim(worker%solver_name) // " --ipc-prefix " // trim(worker%prefix) // " --timeout-ms " // &
|
||||
trim(worker%solver_name) // " --ipc-name " // trim(worker%prefix) // " --timeout-ms " // &
|
||||
trim(int_to_string(worker%timeout_ms))
|
||||
if (len_trim(worker%input_file) > 0) then
|
||||
command_line = trim(command_line) // " --solver-input " // trim(quote_argument(worker%input_file))
|
||||
command_line = trim(command_line) // " --case " // trim(quote_argument(worker%input_file))
|
||||
end if
|
||||
end subroutine build_worker_command_line
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ contains
|
||||
print '(a)', "Usage:"
|
||||
print '(a)', " " // trim(worker_name) // " --help"
|
||||
print '(a)', " " // trim(worker_name) // " --version"
|
||||
print '(a)', " " // trim(worker_name) // " --cclite-worker --solver-id <SPH|FEM> --ipc-prefix <name>"
|
||||
print '(a)', " " // trim(worker_name) // " --cclite-worker --solver-id <SPH|FEM> --case <file> --ipc-name <name>"
|
||||
end subroutine print_worker_help
|
||||
|
||||
subroutine parse_worker_args(default_solver_id, config)
|
||||
@@ -123,7 +123,7 @@ contains
|
||||
call get_command_argument(i, config%solver_name)
|
||||
config%solver_name = adjustl(config%solver_name)
|
||||
end if
|
||||
case ("--ipc-prefix")
|
||||
case ("--ipc-name", "--ipc-prefix")
|
||||
if (i < argc) then
|
||||
i = i + 1
|
||||
call get_command_argument(i, config%prefix)
|
||||
@@ -136,7 +136,7 @@ contains
|
||||
read(arg, *, iostat=ios) config%timeout_ms
|
||||
if (ios /= 0) config%timeout_ms = 5000
|
||||
end if
|
||||
case ("--solver-input")
|
||||
case ("--case", "--solver-input")
|
||||
if (i < argc) then
|
||||
i = i + 1
|
||||
call get_command_argument(i, config%input_file)
|
||||
|
||||
Reference in New Issue
Block a user