From 3230a73c3668290752b9439649454307218dca0d Mon Sep 17 00:00:00 2001 From: Orso Meneghini Date: Sat, 26 Oct 2024 23:05:36 -0700 Subject: [PATCH] avoid code duplication --- src/tjlf_read_input.jl | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/tjlf_read_input.jl b/src/tjlf_read_input.jl index c61e4d4..764c1bd 100644 --- a/src/tjlf_read_input.jl +++ b/src/tjlf_read_input.jl @@ -163,7 +163,7 @@ function checkInput(inputTJLF::InputTJLF) end if typeof(field_value)<:Vector && field_name!=:KY_SPECTRUM && field_name!=:EIGEN_SPECTRUM for val in field_value - @assert !isnan(val) "Did not properly populate inputTJLF for array $field_name = $val" + @assert !isnan(val) "Did not properly populate inputTJLF for array $field_name = $field_value" end end end @@ -174,23 +174,6 @@ end function checkInput(inputTJLFVector::Vector{InputTJLF}) for inputTJLF in inputTJLFVector - field_names = fieldnames(InputTJLF) - for field_name in field_names - field_value = getfield(inputTJLF, field_name) - if typeof(field_value)<:Missing - @assert !ismissing(field_value) "Did not properly populate inputTJLF for $field_name = $field_value" - end - if typeof(field_value)<:Real - @assert !isnan(field_value) "Did not properly populate inputTJLF for $field_name = $field_value" - end - if typeof(field_value)<:Vector && field_name!=:KY_SPECTRUM && field_name!=:EIGEN_SPECTRUM - for val in field_value - @assert !isnan(val) "Did not properly populate inputTJLF for array $field_name = $val" - end - end - end - if !inputTJLF.FIND_EIGEN - @assert !inputTJLF.FIND_WIDTH "If FIND_EIGEN false, FIND_WIDTH should also be false" - end + checkInput(inputTJLF) end end \ No newline at end of file