From 2c758530abce7c8062dc246eca3960647a204f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olav=20M=C3=B8yner?= Date: Tue, 5 Mar 2024 10:44:10 +0100 Subject: [PATCH] Fix to unit handling for operate-type keywords --- src/InputParser/keywords/special.jl | 6 +++--- src/InputParser/utils.jl | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/InputParser/keywords/special.jl b/src/InputParser/keywords/special.jl index 8edecd9..374793c 100644 --- a/src/InputParser/keywords/special.jl +++ b/src/InputParser/keywords/special.jl @@ -307,14 +307,14 @@ function apply_equals!(target, constval, I, J, K, dims) end function parse_keyword!(data, outer_data, units, cfg, f, ::Val{:MAXVALUE}) - edit_apply_clamping!(f, outer_data, min) + edit_apply_clamping!(f, outer_data, units, min) end function parse_keyword!(data, outer_data, units, cfg, f, ::Val{:MINVALUE}) - edit_apply_clamping!(f, outer_data, max) + edit_apply_clamping!(f, outer_data, units, max) end -function edit_apply_clamping!(f, outer_data, FUNCTION) +function edit_apply_clamping!(f, outer_data, units, FUNCTION) rec = read_record(f) l, u = outer_data["GRID"]["CURRENT_BOX"] dims = outer_data["GRID"]["cartDims"] diff --git a/src/InputParser/utils.jl b/src/InputParser/utils.jl index 4095c64..0a4d5a3 100644 --- a/src/InputParser/utils.jl +++ b/src/InputParser/utils.jl @@ -675,7 +675,9 @@ function unit_type(x::Symbol) end function unit_type(::Val{k}) where k - @warn "Unit type not defined for $k." + if !(k in (:FIPNUM, :EQLNUM, :PVTNUM, :SATNUM, :EQLNUM)) + @warn "Unit type not defined for $k." + end return :id end