From dbcf4b5413e4478ae9dd08b8d7e2403bfd5e83da Mon Sep 17 00:00:00 2001 From: jakezw Date: Fri, 28 Nov 2025 16:53:40 -0500 Subject: [PATCH 1/8] Add example unit (164) files --- src/example_unit_datasets/Unit1.unv | 6 ++++++ src/example_unit_datasets/Unit2.unv | 6 ++++++ src/example_unit_datasets/Unit3.unv | 6 ++++++ src/example_unit_datasets/Unit4.unv | 6 ++++++ src/example_unit_datasets/Unit5.unv | 6 ++++++ src/example_unit_datasets/Unit6.unv | 6 ++++++ src/example_unit_datasets/Unit7.unv | 6 ++++++ src/example_unit_datasets/Unit8.unv | 6 ++++++ src/example_unit_datasets/Unit9.unv | 6 ++++++ 9 files changed, 54 insertions(+) create mode 100644 src/example_unit_datasets/Unit1.unv create mode 100644 src/example_unit_datasets/Unit2.unv create mode 100644 src/example_unit_datasets/Unit3.unv create mode 100644 src/example_unit_datasets/Unit4.unv create mode 100644 src/example_unit_datasets/Unit5.unv create mode 100644 src/example_unit_datasets/Unit6.unv create mode 100644 src/example_unit_datasets/Unit7.unv create mode 100644 src/example_unit_datasets/Unit8.unv create mode 100644 src/example_unit_datasets/Unit9.unv diff --git a/src/example_unit_datasets/Unit1.unv b/src/example_unit_datasets/Unit1.unv new file mode 100644 index 0000000..ea2e44f --- /dev/null +++ b/src/example_unit_datasets/Unit1.unv @@ -0,0 +1,6 @@ + -1 + 164 + 1Meter (newton) 2 + 1.00000000000000000D+00 1.00000000000000000D+00 1.00000000000000000D+00 + 2.73150000000000000D+02 + -1 diff --git a/src/example_unit_datasets/Unit2.unv b/src/example_unit_datasets/Unit2.unv new file mode 100644 index 0000000..69f8828 --- /dev/null +++ b/src/example_unit_datasets/Unit2.unv @@ -0,0 +1,6 @@ + -1 + 164 + 2Foot (pound f) 2 + 3.28083989501312345D+00 2.24808943099710489D-01 1.80000000000000000D+00 + 4.59670000000000000D+02 + -1 diff --git a/src/example_unit_datasets/Unit3.unv b/src/example_unit_datasets/Unit3.unv new file mode 100644 index 0000000..83375fc --- /dev/null +++ b/src/example_unit_datasets/Unit3.unv @@ -0,0 +1,6 @@ + -1 + 164 + 3Meter (kilogram f) 2 + 1.00000000000000000D+00 1.01971621297792824D-01 1.00000000000000000D+00 + 2.73150000000000000D+02 + -1 diff --git a/src/example_unit_datasets/Unit4.unv b/src/example_unit_datasets/Unit4.unv new file mode 100644 index 0000000..6fe2661 --- /dev/null +++ b/src/example_unit_datasets/Unit4.unv @@ -0,0 +1,6 @@ + -1 + 164 + 4Foot (poundal) 2 + 3.28083989501312345D+00 7.23301385120989426D+00 1.80000000000000000D+00 + 4.59670000000000000D+02 + -1 diff --git a/src/example_unit_datasets/Unit5.unv b/src/example_unit_datasets/Unit5.unv new file mode 100644 index 0000000..5e41c1e --- /dev/null +++ b/src/example_unit_datasets/Unit5.unv @@ -0,0 +1,6 @@ + -1 + 164 + 5mm (milli-newton) 2 + 1.00000000000000000D+03 1.00000000000000000D+03 1.00000000000000000D+00 + 2.73150000000000000D+02 + -1 diff --git a/src/example_unit_datasets/Unit6.unv b/src/example_unit_datasets/Unit6.unv new file mode 100644 index 0000000..e1149e2 --- /dev/null +++ b/src/example_unit_datasets/Unit6.unv @@ -0,0 +1,6 @@ + -1 + 164 + 6cm (centi-newton) 2 + 1.00000000000000000D+02 1.00000000000000000D+02 1.00000000000000000D+00 + 2.73150000000000000D+02 + -1 diff --git a/src/example_unit_datasets/Unit7.unv b/src/example_unit_datasets/Unit7.unv new file mode 100644 index 0000000..c5d442e --- /dev/null +++ b/src/example_unit_datasets/Unit7.unv @@ -0,0 +1,6 @@ + -1 + 164 + 7Inch (pound f) 2 + 3.93700787401574814D+01 2.24808943099710489D-01 1.80000000000000000D+00 + 4.59670000000000000D+02 + -1 diff --git a/src/example_unit_datasets/Unit8.unv b/src/example_unit_datasets/Unit8.unv new file mode 100644 index 0000000..b1afe84 --- /dev/null +++ b/src/example_unit_datasets/Unit8.unv @@ -0,0 +1,6 @@ + -1 + 164 + 8mm (kilogram f) 2 + 1.00000000000000000D+03 1.01971621297792824D-01 1.00000000000000000D+00 + 2.73150000000000000D+02 + -1 diff --git a/src/example_unit_datasets/Unit9.unv b/src/example_unit_datasets/Unit9.unv new file mode 100644 index 0000000..e79eb03 --- /dev/null +++ b/src/example_unit_datasets/Unit9.unv @@ -0,0 +1,6 @@ + -1 + 164 + 10mm (newton) 2 + 1.00000000000000000D+03 1.00000000000000000D+00 1.00000000000000000D+00 + 2.73150000000000000D+02 + -1 From 78e0bf420155dade2fdb176dfa79e332819f3916 Mon Sep 17 00:00:00 2001 From: jakezw Date: Mon, 1 Dec 2025 21:46:41 -0500 Subject: [PATCH 2/8] Some bug fixes and additional datasets --- src/unit_conversion.jl | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/unit_conversion.jl b/src/unit_conversion.jl index f318427..791c24a 100644 --- a/src/unit_conversion.jl +++ b/src/unit_conversion.jl @@ -74,13 +74,13 @@ function convert_to_si!(ds::Dataset58, conversion_length = 1., conversion_force # Ordinate Denominator if any(ds.ord_denom_spec_dtype .== (0, 1)) - factor /= 1. + factor *= 1. elseif any(ds.ord_denom_spec_dtype .== (8, 11, 12)) - factor /= conversion_length + factor *= conversion_length elseif any(ds.ord_denom_spec_dtype .== (9, 13)) - factor /= conversion_force + factor *= conversion_force elseif any(ds.ord_denom_spec_dtype .== (15)) - factor /= (conversion_force/conversion_length^2) + factor *= (conversion_force/conversion_length^2) else @warn "Conversion factor for $(ds.ord_denom_spec_dtype) not implemented, please submit PR" end @@ -93,12 +93,23 @@ function convert_to_si!(ds::Dataset164, conversion_length = 1., conversion_force return nothing end +function convert_to_si!(ds::Dataset1858, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) + + return nothing +end + function convert_to_si!(ds::Dataset2411, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) - ds.node_coords .*= conversion_length + ds.node_coords ./= conversion_length end function convert_to_si!(ds::Dataset2412, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) + return nothing +end + +function convert_to_si!(ds::Dataset2414, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) + + # To Do return nothing end \ No newline at end of file From 1ca340005cb3826d4b6292905ded3b8142033839 Mon Sep 17 00:00:00 2001 From: jakezw Date: Mon, 1 Dec 2025 22:32:50 -0500 Subject: [PATCH 3/8] Utilize ds164 in array of datasets --- src/unit_conversion.jl | 57 ++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/src/unit_conversion.jl b/src/unit_conversion.jl index 791c24a..b58e11a 100644 --- a/src/unit_conversion.jl +++ b/src/unit_conversion.jl @@ -21,33 +21,35 @@ function convert_to_si!(ds, ds164) conversion_temperature = ds164.conversion_temperature temperature_offset = ds164.temperature_offset - convert_to_si!(ds, conversion_length, conversion_force, conversion_temperature, temperature_offset) + convert_to_si!(ds, ds164) end -function convert_to_si!(ds::Dataset15, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset15, ds164) - ds.node_coords ./= conversion_length + ds.node_coords ./= ds164.conversion_length + return ds164 end -function convert_to_si!(ds::Dataset18, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset18, ds164) - ds.cs_origin ./= conversion_length - ds.cs_x ./= conversion_length - ds.cs_xz ./= conversion_length + ds.cs_origin ./= ds164.conversion_length + ds.cs_x ./= ds164.conversion_length + ds.cs_xz ./= ds164.conversion_length + return ds164 end -function convert_to_si!(ds::Dataset82, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset82, ds164) - return nothing + return ds164 end -function convert_to_si!(ds::Dataset151, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset151, ds164) - return nothing + return ds164 end -function convert_to_si!(ds::Dataset58, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset58, ds164) # Convert data vector # Implemented for ordinate data types 8, 11, 12, 9, 13, 15 @@ -63,11 +65,11 @@ function convert_to_si!(ds::Dataset58, conversion_length = 1., conversion_force if any(ds.ord_spec_dtype .== (0, 1)) factor /= 1. elseif any(ds.ord_spec_dtype .== (8, 11, 12)) - factor /= conversion_length + factor /= ds164.conversion_length elseif any(ds.ord_spec_dtype .== (9, 13)) - factor /= conversion_force + factor /= ds164.conversion_force elseif any(ds.ord_spec_dtype .== (15)) - factor /= (conversion_force/conversion_length^2) + factor /= (ds164.conversion_force/ds164.conversion_length^2) else @warn "Conversion factor for $(ds.ord_spec_dtype) not implemented, please submit PR" end @@ -76,40 +78,41 @@ function convert_to_si!(ds::Dataset58, conversion_length = 1., conversion_force if any(ds.ord_denom_spec_dtype .== (0, 1)) factor *= 1. elseif any(ds.ord_denom_spec_dtype .== (8, 11, 12)) - factor *= conversion_length + factor *= ds164.conversion_length elseif any(ds.ord_denom_spec_dtype .== (9, 13)) - factor *= conversion_force + factor *= ds164.conversion_force elseif any(ds.ord_denom_spec_dtype .== (15)) - factor *= (conversion_force/conversion_length^2) + factor *= (ds164.conversion_force/ds164.conversion_length^2) else @warn "Conversion factor for $(ds.ord_denom_spec_dtype) not implemented, please submit PR" end ds.data .*= factor + return ds164 end -function convert_to_si!(ds::Dataset164, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset164, ds164) - return nothing + return ds end -function convert_to_si!(ds::Dataset1858, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset1858, ds164) - return nothing + return ds164 end -function convert_to_si!(ds::Dataset2411, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset2411, ds164) ds.node_coords ./= conversion_length end -function convert_to_si!(ds::Dataset2412, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset2412, ds164) - return nothing + return ds164 end -function convert_to_si!(ds::Dataset2414, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) +function convert_to_si!(ds::Dataset2414, ds164) # To Do - return nothing + return ds164 end \ No newline at end of file From eb027bf60dc225aa709cc3d4fae6d04445acb804 Mon Sep 17 00:00:00 2001 From: jakezw Date: Mon, 1 Dec 2025 22:36:34 -0500 Subject: [PATCH 4/8] Utilize ds164 bug fixes --- src/unit_conversion.jl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/unit_conversion.jl b/src/unit_conversion.jl index b58e11a..34d992c 100644 --- a/src/unit_conversion.jl +++ b/src/unit_conversion.jl @@ -15,11 +15,8 @@ Converts the units of the given UFF dataset `ds` to SI units in place. **Output** - `ds`: Dataset with its data converted to SI units. """ -function convert_to_si!(ds, ds164) - conversion_length = ds164.conversion_length - conversion_force = ds164.conversion_force - conversion_temperature = ds164.conversion_temperature - temperature_offset = ds164.temperature_offset +function convert_to_si!(ds) + ds164 = Dataset164(1,"SI", 2, 1.0, 1.0, 1.0, 273.15) convert_to_si!(ds, ds164) end From 21a5ce601fc87e422ade0057a8fb9ce234645376 Mon Sep 17 00:00:00 2001 From: jakezw Date: Mon, 1 Dec 2025 23:08:48 -0500 Subject: [PATCH 5/8] Put for loop in convert_to_si() --- src/unit_conversion.jl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/unit_conversion.jl b/src/unit_conversion.jl index 34d992c..1649004 100644 --- a/src/unit_conversion.jl +++ b/src/unit_conversion.jl @@ -15,10 +15,11 @@ Converts the units of the given UFF dataset `ds` to SI units in place. **Output** - `ds`: Dataset with its data converted to SI units. """ -function convert_to_si!(ds) +function convert_to_si!(datasets) ds164 = Dataset164(1,"SI", 2, 1.0, 1.0, 1.0, 273.15) - - convert_to_si!(ds, ds164) + for ds in datasets + ds164 = convert_to_si!(ds, ds164) + end end function convert_to_si!(ds::Dataset15, ds164) From 9f373e53d12437fee7e353de9ed9f6bcde5ba19c Mon Sep 17 00:00:00 2001 From: jakezw Date: Tue, 2 Dec 2025 09:01:59 -0500 Subject: [PATCH 6/8] Add check if dataset is supported and add another option for conversion --- src/unit_conversion.jl | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/unit_conversion.jl b/src/unit_conversion.jl index 1649004..260a67d 100644 --- a/src/unit_conversion.jl +++ b/src/unit_conversion.jl @@ -1,4 +1,5 @@ """ + convert_to_si!(ds) convert_to_si!(ds, ds164) convert_to_si!(ds, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) @@ -15,11 +16,33 @@ Converts the units of the given UFF dataset `ds` to SI units in place. **Output** - `ds`: Dataset with its data converted to SI units. """ -function convert_to_si!(datasets) +function convert_to_si!(datasets::Vector{UFFDataset}) + # This function uses the dataset164 in the vector of datasets to + # perform the conversion, with a default of SI until the first + # dataset164 is read ds164 = Dataset164(1,"SI", 2, 1.0, 1.0, 1.0, 273.15) for ds in datasets - ds164 = convert_to_si!(ds, ds164) + if string(ds.type) in supported_file_extensions() + ds164 = convert_to_si!(ds, ds164) + else + @warn "File type $(ds.type) not support for unit conversions" + end end + return nothing +end + +function convert_to_si!(datasets::Vector{UFFDataset}, ds164::Dataset164) + # This function uses the ds164 as the 2nd argument to + # perform the conversion, regardless of the dataset164's that are in + # the vector of datasets + for ds in datasets + if string(ds.type) in supported_file_extensions() + _ = convert_to_si!(ds, ds164) + else + @warn "File type $(ds.type) not support for unit conversions" + end + end + return nothing end function convert_to_si!(ds::Dataset15, ds164) From 4587a8b07e996f8dcbdd6c6162b222761eda0aeb Mon Sep 17 00:00:00 2001 From: jakezw Date: Tue, 2 Dec 2025 21:59:44 -0500 Subject: [PATCH 7/8] Fix bug in dataset164.jl and in convert_to_si!(), add file dataset151_164_58.unv --- src/datasets/dataset164.jl | 12 ++++++---- src/unit_conversion.jl | 4 ++-- test/datasets/dataset151_164_58.unv | 34 +++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 test/datasets/dataset151_164_58.unv diff --git a/src/datasets/dataset164.jl b/src/datasets/dataset164.jl index af1241b..e087731 100644 --- a/src/datasets/dataset164.jl +++ b/src/datasets/dataset164.jl @@ -71,12 +71,16 @@ Universal Dataset Number: 164 function parse_dataset164(io) # Record 1: FORMAT(I10,20A1,I10) r1 = readline(io) - units, description, temperature_mode = @scanf(r1, "%10d%20s%10d", Int, String, Int)[2:end] + units, description, temperature_mode = @scanf(r1, "%10d%20c%10d", Int, String, Int)[2:end] # Record 2: FORMAT(3D25.17) - conversion_length, conversion_force, conversion_temperature = @scanf(readline(io), "%25e%25e%25e", Float64, Float64, Float64)[2:end] - - conversion_temperature_offset = @scanf(readline(io), "%25e", Float64)[2] + r2 = readline(io) + r2 = replace(r2, 'D' => 'E') + conversion_length, conversion_force, conversion_temperature = @scanf(r2, "%25e%25e%25e", Float64, Float64, Float64)[2:end] + + r3 = readline(io) + r3 = replace(r3, 'D' => 'E') + conversion_temperature_offset = @scanf(r3, "%25e", Float64)[2] # Read trailing " -1" readline(io) diff --git a/src/unit_conversion.jl b/src/unit_conversion.jl index 260a67d..3523079 100644 --- a/src/unit_conversion.jl +++ b/src/unit_conversion.jl @@ -22,7 +22,7 @@ function convert_to_si!(datasets::Vector{UFFDataset}) # dataset164 is read ds164 = Dataset164(1,"SI", 2, 1.0, 1.0, 1.0, 273.15) for ds in datasets - if string(ds.type) in supported_file_extensions() + if replace(string(:Dataset58), "Dataset" => "") in supported_datasets() ds164 = convert_to_si!(ds, ds164) else @warn "File type $(ds.type) not support for unit conversions" @@ -36,7 +36,7 @@ function convert_to_si!(datasets::Vector{UFFDataset}, ds164::Dataset164) # perform the conversion, regardless of the dataset164's that are in # the vector of datasets for ds in datasets - if string(ds.type) in supported_file_extensions() + if replace(string(:Dataset58), "Dataset" => "") in supported_datasets() _ = convert_to_si!(ds, ds164) else @warn "File type $(ds.type) not support for unit conversions" diff --git a/test/datasets/dataset151_164_58.unv b/test/datasets/dataset151_164_58.unv new file mode 100644 index 0000000..346e1f4 --- /dev/null +++ b/test/datasets/dataset151_164_58.unv @@ -0,0 +1,34 @@ + -1 + 151 +Test Universal File +File specific to show unit conversion capability of UFFFiles +Test for Ideas +17-Oct-25 14:58:08 +None None +Compatible to SDRC +23-Oct-25 14:38:11 + -1 + -1 + 164 + 7Inch (pound f) 2 + 3.93700787401574814D+01 2.24808943099710489D-01 1.80000000000000000D+00 + 4.59670000000000000D+02 + -1 + -1 + 58 +NONE +NONE +28-Jan-21 14:01:42 +NONE +NONE + 4 1 1 0 NONE 1 1 NONE 22 1 + 5 10 1 0.00000e+00 2.50000e-01 0.00000e+00 + 18 0 0 0 NONE NONE + 12 1 0 0 NONE NONE + 13 0 1 0 NONE NONE + 0 0 0 0 NONE NONE + 1.73331e-04 0.00000e+00 -5.45225e-07 -1.32963e-05 -1.37127e-06 -6.95395e-06 + -3.70260e-06 -1.21236e-06 -1.33769e-06 -5.04498e-07 1.33122e-06 -4.35957e-06 + -1.94365e-06 -9.69129e-07 -1.16043e-06 -3.54780e-06 -1.51112e-06 -3.34955e-07 + 9.80896e-07 -1.77917e-06 + -1 From 51f0c47e75edac508e9f988cfcd4ec11da0a2785 Mon Sep 17 00:00:00 2001 From: jakezw Date: Wed, 3 Dec 2025 11:13:15 -0500 Subject: [PATCH 8/8] Fix dataset164, documentation of changes in unit_conversion.jl, replace dataset55.unv with good one, add tests for convert_to_si() --- Project.toml | 2 + src/datasets/dataset164.jl | 1 + src/unit_conversion.jl | 36 +- ...51_164_58.unv => dataset151_164_58_55.unv} | 29 +- test/datasets/dataset55.unv | 590 +----------------- test/datasets/dataset55_bad_format.unv | 589 +++++++++++++++++ test/runtests.jl | 61 +- .../written_datasets/dataset151_164_58_55.unv | 51 ++ 8 files changed, 754 insertions(+), 605 deletions(-) rename test/datasets/{dataset151_164_58.unv => dataset151_164_58_55.unv} (62%) create mode 100644 test/datasets/dataset55_bad_format.unv create mode 100644 test/written_datasets/dataset151_164_58_55.unv diff --git a/Project.toml b/Project.toml index 44f5413..3a458a5 100644 --- a/Project.toml +++ b/Project.toml @@ -5,11 +5,13 @@ authors = ["Mathieu Aucejo <79322171+maucejo@users.noreply.github.com> and contr [deps] Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" +Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" Scanf = "6ef1bc8b-493b-44e1-8d40-549aa65c4b41" [compat] Dates = "1.11.0" +Glob = "1.3.1" Printf = "1.11.0" Scanf = "0.5.4" Test = "1.11.0" diff --git a/src/datasets/dataset164.jl b/src/datasets/dataset164.jl index e087731..a0a3107 100644 --- a/src/datasets/dataset164.jl +++ b/src/datasets/dataset164.jl @@ -72,6 +72,7 @@ function parse_dataset164(io) # Record 1: FORMAT(I10,20A1,I10) r1 = readline(io) units, description, temperature_mode = @scanf(r1, "%10d%20c%10d", Int, String, Int)[2:end] + description = strip(description) # Record 2: FORMAT(3D25.17) r2 = readline(io) diff --git a/src/unit_conversion.jl b/src/unit_conversion.jl index 3523079..2d7509f 100644 --- a/src/unit_conversion.jl +++ b/src/unit_conversion.jl @@ -4,18 +4,29 @@ convert_to_si!(ds, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) Converts the units of the given UFF dataset `ds` to SI units in place. +Note that the mass is defined as F/a and its units will be determined by F & a **Input** -- `ds`: A UFF dataset object that contains dimensional data to be converted. +- `ds`: A vector of UFF datasets that contains dimensional data to be converted. - `ds164`: (Optional) A Dataset164 object that provides conversion factors. - `conversion_length`: (Optional) Conversion factor for length units. - `conversion_force`: (Optional) Conversion factor for force units. - `conversion_temperature`: (Optional) Conversion factor for temperature units. - `temperature_offset`: (Optional) Offset to be applied for temperature conversion. +convert_to_si!(ds) reads the last encountered 164 dataset and uses its conversion factors, defaults to SI +convert_to_si!(ds, ds164) ignores the dataset164 datasets in the vector of datasets and uses the argument ds164 +convert_to_si!(ds, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 0.) + creates a ds164 and acts the same as convert_to_si!(ds, ds164) + **Output** - `ds`: Dataset with its data converted to SI units. """ +function convert_to_si!(dsconvert_to_si!(ds, conversion_length = 1., conversion_force = 1., conversion_temperature = 1., temperature_offset = 273.15)) + ds164 = Dataset164(1,"User Defined", 2, conversion_length, conversion_force, conversion_temperature, temperature_offset) + convert_to_si!(ds, ds164) +end + function convert_to_si!(datasets::Vector{UFFDataset}) # This function uses the dataset164 in the vector of datasets to # perform the conversion, with a default of SI until the first @@ -70,6 +81,29 @@ function convert_to_si!(ds::Dataset151, ds164) return ds164 end +function convert_to_si!(ds::Dataset55, ds164) + + # Convert data vector + # Implemented for data types 8, 11, 12, 9, 13, 15 + + factor = 1. + # Data Type + if any(ds.spec_dtype .== (0, 1)) + factor /= 1. + elseif any(ds.spec_dtype .== (8, 11, 12)) + factor /= ds164.conversion_length + elseif any(ds.spec_dtype .== (4, 9)) + factor /= ds164.conversion_force + elseif any(ds.spec_dtype .== (2, 15)) + factor /= (ds164.conversion_force/ds164.conversion_length^2) + else + @warn "Conversion factor for $(ds.spec_dtype) not implemented, please submit PR" + end + + ds.data .*= factor + return ds164 +end + function convert_to_si!(ds::Dataset58, ds164) # Convert data vector diff --git a/test/datasets/dataset151_164_58.unv b/test/datasets/dataset151_164_58_55.unv similarity index 62% rename from test/datasets/dataset151_164_58.unv rename to test/datasets/dataset151_164_58_55.unv index 346e1f4..c8c448b 100644 --- a/test/datasets/dataset151_164_58.unv +++ b/test/datasets/dataset151_164_58_55.unv @@ -3,7 +3,7 @@ Test Universal File File specific to show unit conversion capability of UFFFiles Test for Ideas -17-Oct-25 14:58:08 +17-Oct-25 14:58:08 28 0 0 None None Compatible to SDRC 23-Oct-25 14:38:11 @@ -31,4 +31,29 @@ NONE -3.70260e-06 -1.21236e-06 -1.33769e-06 -5.04498e-07 1.33122e-06 -4.35957e-06 -1.94365e-06 -9.69129e-07 -1.16043e-06 -3.54780e-06 -1.51112e-06 -3.34955e-07 9.80896e-07 -1.77917e-06 - -1 + -1 + -1 + 55 +None, ConjMAC= 0.987, MPC= 0.894 +NONE +NONE +NONE +NONE + 1 3 2 8 5 3 + 2 6 1 1 + -9.0604E-01 2.5080E+01 -9.6099E-07 -1.2959E-05 3.2587E-04 -1.2360E-05 + 1 + 2.2180E-07 1.7824E-06 1.2057E-08 -1.1953E-05 1.3622E-07 1.8514E-07 + 2 + 9.0184E-07 1.4043E-06 -1.0507E-08 -1.2645E-05 1.2502E-07 -1.7648E-07 + 3 + 7.6630E-07 2.6104E-06 -5.7568E-08 -1.2168E-05 6.9899E-08 9.3158E-08 + 4 + 6.6829E-07 2.6144E-06 -4.6781E-08 -1.2152E-05 1.0911E-07 2.6736E-07 + 5 + 7.2950E-07 3.1019E-06 -2.5970E-07 -1.1832E-05 6.3576E-08 -1.1018E-07 + 6 + 8.1909E-07 3.2610E-06 -2.1364E-07 -1.2211E-05 2.0570E-08 7.6194E-08 + 7 + 2.6237E-07 3.9112E-06 -9.6099E-07 -1.2959E-05 5.2119E-07 6.6091E-07 + -1 \ No newline at end of file diff --git a/test/datasets/dataset55.unv b/test/datasets/dataset55.unv index 642dfc6..79d50f9 100644 --- a/test/datasets/dataset55.unv +++ b/test/datasets/dataset55.unv @@ -1,589 +1,25 @@ -1 55 -Frequency band: 37Hz -Vib Displacement +None, ConjMAC= 0.987, MPC= 0.894 NONE NONE - 0 3 12 13 - 1 2 2 8 5 3 - 2 4 0 1 - 3.71094e+01 2.30193e+02 1.00000e+00 0.00000e+00 +NONE +NONE + 1 3 2 8 5 3 + 2 6 1 1 + -9.0604E-01 2.5080E+01 -9.6099E-07 -1.2959E-05 3.2587E-04 -1.2360E-05 1 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.95048e-08 0.00000e+00 + 2.2180E-07 1.7824E-06 1.2057E-08 -1.1953E-05 1.3622E-07 1.8514E-07 2 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.40412e-08 0.00000e+00 + 9.0184E-07 1.4043E-06 -1.0507E-08 -1.2645E-05 1.2502E-07 -1.7648E-07 3 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.86622e-08 0.00000e+00 + 7.6630E-07 2.6104E-06 -5.7568E-08 -1.2168E-05 6.9899E-08 9.3158E-08 4 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.93095e-07 0.00000e+00 + 6.6829E-07 2.6144E-06 -4.6781E-08 -1.2152E-05 1.0911E-07 2.6736E-07 5 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.23017e-07 0.00000e+00 + 7.2950E-07 3.1019E-06 -2.5970E-07 -1.1832E-05 6.3576E-08 -1.1018E-07 6 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.33642e-07 0.00000e+00 + 8.1909E-07 3.2610E-06 -2.1364E-07 -1.2211E-05 2.0570E-08 7.6194E-08 7 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.16043e-07 0.00000e+00 - 8 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.39019e-07 0.00000e+00 - 9 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.56882e-07 0.00000e+00 - 10 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.87526e-08 0.00000e+00 - 11 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.69163e-08 0.00000e+00 - 12 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.43116e-08 0.00000e+00 - 13 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.86172e-07 0.00000e+00 - 14 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.06238e-07 0.00000e+00 - 15 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.25588e-07 0.00000e+00 - 16 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.40972e-07 0.00000e+00 - 17 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.02123e-07 0.00000e+00 - 18 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.26178e-07 0.00000e+00 - 19 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.47979e-07 0.00000e+00 - 20 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.68792e-07 0.00000e+00 - 21 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.35918e-08 0.00000e+00 - 22 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.07730e-08 0.00000e+00 - 23 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.00863e-08 0.00000e+00 - 24 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.77398e-08 0.00000e+00 - 25 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.32461e-08 0.00000e+00 - 26 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.75190e-07 0.00000e+00 - 27 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.05646e-07 0.00000e+00 - 28 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.24149e-07 0.00000e+00 - 29 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.38310e-07 0.00000e+00 - 30 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.55374e-07 0.00000e+00 - 31 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.89339e-07 0.00000e+00 - 32 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.07651e-07 0.00000e+00 - 33 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.29525e-07 0.00000e+00 - 34 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.46219e-07 0.00000e+00 - 35 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.64887e-07 0.00000e+00 - 36 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.86770e-07 0.00000e+00 - 37 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.52587e-08 0.00000e+00 - 38 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.97913e-08 0.00000e+00 - 39 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.23566e-08 0.00000e+00 - 40 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.19065e-08 0.00000e+00 - 41 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.86437e-08 0.00000e+00 - 42 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.48170e-08 0.00000e+00 - 43 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.23907e-08 0.00000e+00 - 44 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.62203e-07 0.00000e+00 - 45 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.87037e-07 0.00000e+00 - 46 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.08015e-07 0.00000e+00 - 47 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.25036e-07 0.00000e+00 - 48 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.38935e-07 0.00000e+00 - 49 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.55211e-07 0.00000e+00 - 50 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.70738e-07 0.00000e+00 - 51 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.69355e-07 0.00000e+00 - 52 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.88166e-07 0.00000e+00 - 53 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.06924e-07 0.00000e+00 - 54 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.26970e-07 0.00000e+00 - 55 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.49489e-07 0.00000e+00 - 56 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.65662e-07 0.00000e+00 - 57 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84105e-07 0.00000e+00 - 58 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.06343e-07 0.00000e+00 - 59 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.70292e-08 0.00000e+00 - 60 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.86154e-08 0.00000e+00 - 61 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.97912e-08 0.00000e+00 - 62 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.20204e-08 0.00000e+00 - 63 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.99799e-08 0.00000e+00 - 64 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.71273e-08 0.00000e+00 - 65 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.52632e-08 0.00000e+00 - 66 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.13749e-08 0.00000e+00 - 67 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.14803e-08 0.00000e+00 - 68 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.45943e-07 0.00000e+00 - 69 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.71331e-07 0.00000e+00 - 70 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.89313e-07 0.00000e+00 - 71 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.07783e-07 0.00000e+00 - 72 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.28156e-07 0.00000e+00 - 73 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.38993e-07 0.00000e+00 - 74 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.54741e-07 0.00000e+00 - 75 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.69562e-07 0.00000e+00 - 76 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.87112e-07 0.00000e+00 - 77 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.56299e-07 0.00000e+00 - 78 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.68850e-07 0.00000e+00 - 79 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.89886e-07 0.00000e+00 - 80 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.08237e-07 0.00000e+00 - 81 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.30993e-07 0.00000e+00 - 82 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.46199e-07 0.00000e+00 - 83 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.70493e-07 0.00000e+00 - 84 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.81934e-07 0.00000e+00 - 85 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.96132e-07 0.00000e+00 - 86 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.22387e-07 0.00000e+00 - 87 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.17626e-09 0.00000e+00 - 88 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.81195e-08 0.00000e+00 - 89 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.61856e-08 0.00000e+00 - 90 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.49101e-08 0.00000e+00 - 91 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.40940e-08 0.00000e+00 - 92 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.88908e-08 0.00000e+00 - 93 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.26973e-08 0.00000e+00 - 94 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.03916e-08 0.00000e+00 - 95 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.96049e-08 0.00000e+00 - 96 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.97159e-08 0.00000e+00 - 97 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.00795e-07 0.00000e+00 - 98 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.07883e-07 0.00000e+00 - 99 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.23417e-07 0.00000e+00 - 100 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.32414e-07 0.00000e+00 - 101 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.53845e-07 0.00000e+00 - 102 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.72682e-07 0.00000e+00 - 103 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.84415e-07 0.00000e+00 - 104 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.00408e-07 0.00000e+00 - 105 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.42084e-07 0.00000e+00 - 106 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.51969e-07 0.00000e+00 - 107 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.66664e-07 0.00000e+00 - 108 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.81656e-07 0.00000e+00 - 109 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.01542e-07 0.00000e+00 - 110 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.14918e-07 0.00000e+00 - 111 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.30078e-07 0.00000e+00 - 112 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.51783e-07 0.00000e+00 - 113 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.71322e-07 0.00000e+00 - 114 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.85856e-07 0.00000e+00 - 115 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.11982e-07 0.00000e+00 - 116 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.34062e-07 0.00000e+00 - 117 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84057e-07 0.00000e+00 - 118 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.96264e-07 0.00000e+00 - 119 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.16643e-07 0.00000e+00 - 120 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.41446e-07 0.00000e+00 - 121 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.41322e-07 0.00000e+00 - 122 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.80141e-09 0.00000e+00 - 123 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.03069e-08 0.00000e+00 - 124 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.75580e-08 0.00000e+00 - 125 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.59896e-08 0.00000e+00 - 126 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.41483e-08 0.00000e+00 - 127 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.20709e-08 0.00000e+00 - 128 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.93831e-08 0.00000e+00 - 129 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.94275e-08 0.00000e+00 - 130 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.93174e-08 0.00000e+00 - 131 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.97688e-08 0.00000e+00 - 132 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.09851e-07 0.00000e+00 - 133 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.22436e-07 0.00000e+00 - 134 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.38989e-07 0.00000e+00 - 135 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.53589e-07 0.00000e+00 - 136 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.70596e-07 0.00000e+00 - 137 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.86986e-07 0.00000e+00 - 138 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.99568e-07 0.00000e+00 - 139 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.46782e-07 0.00000e+00 - 140 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.65525e-07 0.00000e+00 - 141 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.83639e-07 0.00000e+00 - 142 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.01723e-07 0.00000e+00 - 143 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.15201e-07 0.00000e+00 - 144 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.33078e-07 0.00000e+00 - 145 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.52692e-07 0.00000e+00 - 146 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.68629e-07 0.00000e+00 - 147 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.80779e-07 0.00000e+00 - 148 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.09193e-07 0.00000e+00 - 149 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.32830e-07 0.00000e+00 - 150 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84107e-07 0.00000e+00 - 151 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.98800e-07 0.00000e+00 - 152 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.16183e-07 0.00000e+00 - 153 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.36972e-07 0.00000e+00 - 154 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.50003e-07 0.00000e+00 - 155 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.26931e-09 0.00000e+00 - 156 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.08522e-08 0.00000e+00 - 157 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.87431e-08 0.00000e+00 - 158 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.72243e-08 0.00000e+00 - 159 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.74449e-08 0.00000e+00 - 160 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.91972e-08 0.00000e+00 - 161 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.75408e-08 0.00000e+00 - 162 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.96277e-08 0.00000e+00 - 163 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.11502e-08 0.00000e+00 - 164 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.96281e-08 0.00000e+00 - 165 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.98573e-08 0.00000e+00 - 166 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.00571e-07 0.00000e+00 - 167 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.10058e-07 0.00000e+00 - 168 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.22031e-07 0.00000e+00 - 169 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.39526e-07 0.00000e+00 - 170 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.55305e-07 0.00000e+00 - 171 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.70679e-07 0.00000e+00 - 172 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.88298e-07 0.00000e+00 - 173 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.04878e-07 0.00000e+00 - 174 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.23670e-07 0.00000e+00 - 175 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.37408e-07 0.00000e+00 - 176 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.53895e-07 0.00000e+00 - 177 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.67836e-07 0.00000e+00 - 178 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.84591e-07 0.00000e+00 - 179 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.00621e-07 0.00000e+00 - 180 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.18092e-07 0.00000e+00 - 181 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.27557e-07 0.00000e+00 - 182 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.51522e-07 0.00000e+00 - 183 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.69761e-07 0.00000e+00 - 184 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.93830e-07 0.00000e+00 - 185 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.03930e-07 0.00000e+00 - 186 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.30757e-07 0.00000e+00 - 187 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.47739e-07 0.00000e+00 - 188 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.71356e-07 0.00000e+00 - 189 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.78266e-07 0.00000e+00 - 190 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.01081e-07 0.00000e+00 - 191 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.14420e-07 0.00000e+00 - 192 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.38377e-07 0.00000e+00 - 193 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.50291e-07 0.00000e+00 - 194 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.56776e-09 0.00000e+00 - 195 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.96381e-08 0.00000e+00 - 196 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.83513e-08 0.00000e+00 - 197 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.99782e-08 0.00000e+00 - 198 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.16881e-08 0.00000e+00 - 199 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.11152e-08 0.00000e+00 - 200 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.90388e-08 0.00000e+00 - 201 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.29687e-08 0.00000e+00 - 202 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.16133e-08 0.00000e+00 - 203 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.12400e-08 0.00000e+00 - 204 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.96069e-08 0.00000e+00 - 205 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.40331e-07 0.00000e+00 - 206 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.55361e-07 0.00000e+00 - 207 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.71585e-07 0.00000e+00 - 208 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.91111e-07 0.00000e+00 - 209 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.07983e-07 0.00000e+00 - 210 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.26094e-07 0.00000e+00 - 211 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.41219e-07 0.00000e+00 - 212 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.53955e-07 0.00000e+00 - 213 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.68974e-07 0.00000e+00 - 214 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.86288e-07 0.00000e+00 - 215 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.53283e-07 0.00000e+00 - 216 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.70951e-07 0.00000e+00 - 217 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.89354e-07 0.00000e+00 - 218 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.09231e-07 0.00000e+00 - 219 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.32725e-07 0.00000e+00 - 220 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.51733e-07 0.00000e+00 - 221 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.66019e-07 0.00000e+00 - 222 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84915e-07 0.00000e+00 - 223 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.98266e-07 0.00000e+00 - 224 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.15529e-07 0.00000e+00 - 225 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.85891e-08 0.00000e+00 - 226 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.29395e-08 0.00000e+00 - 227 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.00738e-08 0.00000e+00 - 228 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.10639e-08 0.00000e+00 - 229 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.06421e-08 0.00000e+00 - 230 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.74922e-08 0.00000e+00 - 231 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.49150e-08 0.00000e+00 - 232 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.51509e-08 0.00000e+00 - 233 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.01410e-08 0.00000e+00 - 234 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.55962e-07 0.00000e+00 - 235 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.71351e-07 0.00000e+00 - 236 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.89611e-07 0.00000e+00 - 237 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.07625e-07 0.00000e+00 - 238 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.24354e-07 0.00000e+00 - 239 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.39520e-07 0.00000e+00 - 240 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.53725e-07 0.00000e+00 - 241 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.70538e-07 0.00000e+00 - 242 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.71666e-07 0.00000e+00 - 243 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.91873e-07 0.00000e+00 - 244 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.08350e-07 0.00000e+00 - 245 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.29825e-07 0.00000e+00 - 246 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.49981e-07 0.00000e+00 - 247 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.66825e-07 0.00000e+00 - 248 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84676e-07 0.00000e+00 - 249 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.02495e-07 0.00000e+00 - 250 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.02415e-08 0.00000e+00 - 251 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.87203e-08 0.00000e+00 - 252 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.88106e-08 0.00000e+00 - 253 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.57506e-08 0.00000e+00 - 254 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.40060e-08 0.00000e+00 - 255 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.08844e-08 0.00000e+00 - 256 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.72377e-07 0.00000e+00 - 257 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.87707e-07 0.00000e+00 - 258 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.06772e-07 0.00000e+00 - 259 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.23750e-07 0.00000e+00 - 260 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.39939e-07 0.00000e+00 - 261 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.56696e-07 0.00000e+00 - 262 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.92668e-07 0.00000e+00 - 263 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.07868e-07 0.00000e+00 - 264 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.31742e-07 0.00000e+00 - 265 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.50639e-07 0.00000e+00 - 266 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.65748e-07 0.00000e+00 - 267 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.87842e-07 0.00000e+00 - 268 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.80472e-08 0.00000e+00 - 269 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.65514e-08 0.00000e+00 - 270 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.49118e-08 0.00000e+00 - 271 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.15157e-08 0.00000e+00 - 272 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.88691e-07 0.00000e+00 - 273 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.07321e-07 0.00000e+00 - 274 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.25278e-07 0.00000e+00 - 275 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.45648e-07 0.00000e+00 - 276 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.04621e-07 0.00000e+00 - 277 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.27045e-07 0.00000e+00 - 278 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.50096e-07 0.00000e+00 - 279 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.64140e-07 0.00000e+00 - 280 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.15432e-08 0.00000e+00 - 281 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.37352e-08 0.00000e+00 - 282 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.42096e-08 0.00000e+00 - 283 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.01638e-07 0.00000e+00 - 284 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.22356e-07 0.00000e+00 - 285 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.36123e-07 0.00000e+00 - 286 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.17550e-07 0.00000e+00 - 287 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.46034e-07 0.00000e+00 - 288 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.69130e-07 0.00000e+00 - 289 - 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.77389e-09 0.00000e+00 + 2.6237E-07 3.9112E-06 -9.6099E-07 -1.2959E-05 5.2119E-07 6.6091E-07 -1 \ No newline at end of file diff --git a/test/datasets/dataset55_bad_format.unv b/test/datasets/dataset55_bad_format.unv new file mode 100644 index 0000000..642dfc6 --- /dev/null +++ b/test/datasets/dataset55_bad_format.unv @@ -0,0 +1,589 @@ + -1 + 55 +Frequency band: 37Hz +Vib Displacement +NONE +NONE + 0 3 12 13 + 1 2 2 8 5 3 + 2 4 0 1 + 3.71094e+01 2.30193e+02 1.00000e+00 0.00000e+00 + 1 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.95048e-08 0.00000e+00 + 2 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.40412e-08 0.00000e+00 + 3 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.86622e-08 0.00000e+00 + 4 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.93095e-07 0.00000e+00 + 5 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.23017e-07 0.00000e+00 + 6 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.33642e-07 0.00000e+00 + 7 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.16043e-07 0.00000e+00 + 8 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.39019e-07 0.00000e+00 + 9 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.56882e-07 0.00000e+00 + 10 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.87526e-08 0.00000e+00 + 11 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.69163e-08 0.00000e+00 + 12 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.43116e-08 0.00000e+00 + 13 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.86172e-07 0.00000e+00 + 14 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.06238e-07 0.00000e+00 + 15 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.25588e-07 0.00000e+00 + 16 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.40972e-07 0.00000e+00 + 17 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.02123e-07 0.00000e+00 + 18 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.26178e-07 0.00000e+00 + 19 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.47979e-07 0.00000e+00 + 20 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.68792e-07 0.00000e+00 + 21 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.35918e-08 0.00000e+00 + 22 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.07730e-08 0.00000e+00 + 23 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.00863e-08 0.00000e+00 + 24 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.77398e-08 0.00000e+00 + 25 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.32461e-08 0.00000e+00 + 26 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.75190e-07 0.00000e+00 + 27 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.05646e-07 0.00000e+00 + 28 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.24149e-07 0.00000e+00 + 29 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.38310e-07 0.00000e+00 + 30 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.55374e-07 0.00000e+00 + 31 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.89339e-07 0.00000e+00 + 32 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.07651e-07 0.00000e+00 + 33 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.29525e-07 0.00000e+00 + 34 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.46219e-07 0.00000e+00 + 35 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.64887e-07 0.00000e+00 + 36 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.86770e-07 0.00000e+00 + 37 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.52587e-08 0.00000e+00 + 38 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.97913e-08 0.00000e+00 + 39 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.23566e-08 0.00000e+00 + 40 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.19065e-08 0.00000e+00 + 41 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.86437e-08 0.00000e+00 + 42 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.48170e-08 0.00000e+00 + 43 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.23907e-08 0.00000e+00 + 44 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.62203e-07 0.00000e+00 + 45 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.87037e-07 0.00000e+00 + 46 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.08015e-07 0.00000e+00 + 47 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.25036e-07 0.00000e+00 + 48 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.38935e-07 0.00000e+00 + 49 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.55211e-07 0.00000e+00 + 50 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.70738e-07 0.00000e+00 + 51 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.69355e-07 0.00000e+00 + 52 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.88166e-07 0.00000e+00 + 53 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.06924e-07 0.00000e+00 + 54 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.26970e-07 0.00000e+00 + 55 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.49489e-07 0.00000e+00 + 56 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.65662e-07 0.00000e+00 + 57 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84105e-07 0.00000e+00 + 58 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.06343e-07 0.00000e+00 + 59 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.70292e-08 0.00000e+00 + 60 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.86154e-08 0.00000e+00 + 61 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.97912e-08 0.00000e+00 + 62 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.20204e-08 0.00000e+00 + 63 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.99799e-08 0.00000e+00 + 64 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.71273e-08 0.00000e+00 + 65 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.52632e-08 0.00000e+00 + 66 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.13749e-08 0.00000e+00 + 67 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.14803e-08 0.00000e+00 + 68 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.45943e-07 0.00000e+00 + 69 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.71331e-07 0.00000e+00 + 70 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.89313e-07 0.00000e+00 + 71 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.07783e-07 0.00000e+00 + 72 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.28156e-07 0.00000e+00 + 73 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.38993e-07 0.00000e+00 + 74 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.54741e-07 0.00000e+00 + 75 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.69562e-07 0.00000e+00 + 76 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.87112e-07 0.00000e+00 + 77 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.56299e-07 0.00000e+00 + 78 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.68850e-07 0.00000e+00 + 79 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.89886e-07 0.00000e+00 + 80 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.08237e-07 0.00000e+00 + 81 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.30993e-07 0.00000e+00 + 82 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.46199e-07 0.00000e+00 + 83 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.70493e-07 0.00000e+00 + 84 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.81934e-07 0.00000e+00 + 85 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.96132e-07 0.00000e+00 + 86 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.22387e-07 0.00000e+00 + 87 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.17626e-09 0.00000e+00 + 88 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.81195e-08 0.00000e+00 + 89 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.61856e-08 0.00000e+00 + 90 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.49101e-08 0.00000e+00 + 91 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.40940e-08 0.00000e+00 + 92 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.88908e-08 0.00000e+00 + 93 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.26973e-08 0.00000e+00 + 94 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.03916e-08 0.00000e+00 + 95 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.96049e-08 0.00000e+00 + 96 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.97159e-08 0.00000e+00 + 97 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.00795e-07 0.00000e+00 + 98 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.07883e-07 0.00000e+00 + 99 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.23417e-07 0.00000e+00 + 100 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.32414e-07 0.00000e+00 + 101 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.53845e-07 0.00000e+00 + 102 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.72682e-07 0.00000e+00 + 103 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.84415e-07 0.00000e+00 + 104 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.00408e-07 0.00000e+00 + 105 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.42084e-07 0.00000e+00 + 106 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.51969e-07 0.00000e+00 + 107 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.66664e-07 0.00000e+00 + 108 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.81656e-07 0.00000e+00 + 109 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.01542e-07 0.00000e+00 + 110 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.14918e-07 0.00000e+00 + 111 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.30078e-07 0.00000e+00 + 112 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.51783e-07 0.00000e+00 + 113 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.71322e-07 0.00000e+00 + 114 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.85856e-07 0.00000e+00 + 115 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.11982e-07 0.00000e+00 + 116 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.34062e-07 0.00000e+00 + 117 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84057e-07 0.00000e+00 + 118 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.96264e-07 0.00000e+00 + 119 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.16643e-07 0.00000e+00 + 120 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.41446e-07 0.00000e+00 + 121 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.41322e-07 0.00000e+00 + 122 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.80141e-09 0.00000e+00 + 123 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.03069e-08 0.00000e+00 + 124 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.75580e-08 0.00000e+00 + 125 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.59896e-08 0.00000e+00 + 126 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.41483e-08 0.00000e+00 + 127 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.20709e-08 0.00000e+00 + 128 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.93831e-08 0.00000e+00 + 129 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.94275e-08 0.00000e+00 + 130 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.93174e-08 0.00000e+00 + 131 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.97688e-08 0.00000e+00 + 132 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.09851e-07 0.00000e+00 + 133 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.22436e-07 0.00000e+00 + 134 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.38989e-07 0.00000e+00 + 135 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.53589e-07 0.00000e+00 + 136 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.70596e-07 0.00000e+00 + 137 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.86986e-07 0.00000e+00 + 138 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.99568e-07 0.00000e+00 + 139 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.46782e-07 0.00000e+00 + 140 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.65525e-07 0.00000e+00 + 141 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.83639e-07 0.00000e+00 + 142 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.01723e-07 0.00000e+00 + 143 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.15201e-07 0.00000e+00 + 144 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.33078e-07 0.00000e+00 + 145 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.52692e-07 0.00000e+00 + 146 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.68629e-07 0.00000e+00 + 147 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.80779e-07 0.00000e+00 + 148 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.09193e-07 0.00000e+00 + 149 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.32830e-07 0.00000e+00 + 150 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84107e-07 0.00000e+00 + 151 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.98800e-07 0.00000e+00 + 152 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.16183e-07 0.00000e+00 + 153 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.36972e-07 0.00000e+00 + 154 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.50003e-07 0.00000e+00 + 155 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.26931e-09 0.00000e+00 + 156 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.08522e-08 0.00000e+00 + 157 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.87431e-08 0.00000e+00 + 158 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.72243e-08 0.00000e+00 + 159 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.74449e-08 0.00000e+00 + 160 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.91972e-08 0.00000e+00 + 161 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.75408e-08 0.00000e+00 + 162 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.96277e-08 0.00000e+00 + 163 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.11502e-08 0.00000e+00 + 164 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.96281e-08 0.00000e+00 + 165 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.98573e-08 0.00000e+00 + 166 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.00571e-07 0.00000e+00 + 167 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.10058e-07 0.00000e+00 + 168 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.22031e-07 0.00000e+00 + 169 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.39526e-07 0.00000e+00 + 170 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.55305e-07 0.00000e+00 + 171 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.70679e-07 0.00000e+00 + 172 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.88298e-07 0.00000e+00 + 173 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.04878e-07 0.00000e+00 + 174 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.23670e-07 0.00000e+00 + 175 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.37408e-07 0.00000e+00 + 176 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.53895e-07 0.00000e+00 + 177 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.67836e-07 0.00000e+00 + 178 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.84591e-07 0.00000e+00 + 179 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.00621e-07 0.00000e+00 + 180 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.18092e-07 0.00000e+00 + 181 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.27557e-07 0.00000e+00 + 182 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.51522e-07 0.00000e+00 + 183 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.69761e-07 0.00000e+00 + 184 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.93830e-07 0.00000e+00 + 185 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.03930e-07 0.00000e+00 + 186 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.30757e-07 0.00000e+00 + 187 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.47739e-07 0.00000e+00 + 188 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.71356e-07 0.00000e+00 + 189 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.78266e-07 0.00000e+00 + 190 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.01081e-07 0.00000e+00 + 191 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.14420e-07 0.00000e+00 + 192 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.38377e-07 0.00000e+00 + 193 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.50291e-07 0.00000e+00 + 194 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.56776e-09 0.00000e+00 + 195 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.96381e-08 0.00000e+00 + 196 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.83513e-08 0.00000e+00 + 197 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.99782e-08 0.00000e+00 + 198 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.16881e-08 0.00000e+00 + 199 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.11152e-08 0.00000e+00 + 200 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.90388e-08 0.00000e+00 + 201 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.29687e-08 0.00000e+00 + 202 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.16133e-08 0.00000e+00 + 203 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.12400e-08 0.00000e+00 + 204 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.96069e-08 0.00000e+00 + 205 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.40331e-07 0.00000e+00 + 206 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.55361e-07 0.00000e+00 + 207 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.71585e-07 0.00000e+00 + 208 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.91111e-07 0.00000e+00 + 209 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.07983e-07 0.00000e+00 + 210 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.26094e-07 0.00000e+00 + 211 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.41219e-07 0.00000e+00 + 212 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.53955e-07 0.00000e+00 + 213 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.68974e-07 0.00000e+00 + 214 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.86288e-07 0.00000e+00 + 215 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.53283e-07 0.00000e+00 + 216 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.70951e-07 0.00000e+00 + 217 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.89354e-07 0.00000e+00 + 218 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.09231e-07 0.00000e+00 + 219 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.32725e-07 0.00000e+00 + 220 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.51733e-07 0.00000e+00 + 221 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.66019e-07 0.00000e+00 + 222 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84915e-07 0.00000e+00 + 223 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.98266e-07 0.00000e+00 + 224 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.15529e-07 0.00000e+00 + 225 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.85891e-08 0.00000e+00 + 226 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.29395e-08 0.00000e+00 + 227 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.00738e-08 0.00000e+00 + 228 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.10639e-08 0.00000e+00 + 229 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.06421e-08 0.00000e+00 + 230 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.74922e-08 0.00000e+00 + 231 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.49150e-08 0.00000e+00 + 232 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.51509e-08 0.00000e+00 + 233 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 9.01410e-08 0.00000e+00 + 234 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.55962e-07 0.00000e+00 + 235 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.71351e-07 0.00000e+00 + 236 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.89611e-07 0.00000e+00 + 237 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.07625e-07 0.00000e+00 + 238 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.24354e-07 0.00000e+00 + 239 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.39520e-07 0.00000e+00 + 240 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.53725e-07 0.00000e+00 + 241 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.70538e-07 0.00000e+00 + 242 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.71666e-07 0.00000e+00 + 243 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.91873e-07 0.00000e+00 + 244 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.08350e-07 0.00000e+00 + 245 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.29825e-07 0.00000e+00 + 246 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.49981e-07 0.00000e+00 + 247 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.66825e-07 0.00000e+00 + 248 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.84676e-07 0.00000e+00 + 249 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.02495e-07 0.00000e+00 + 250 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.02415e-08 0.00000e+00 + 251 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.87203e-08 0.00000e+00 + 252 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.88106e-08 0.00000e+00 + 253 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.57506e-08 0.00000e+00 + 254 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.40060e-08 0.00000e+00 + 255 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 8.08844e-08 0.00000e+00 + 256 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.72377e-07 0.00000e+00 + 257 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.87707e-07 0.00000e+00 + 258 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.06772e-07 0.00000e+00 + 259 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.23750e-07 0.00000e+00 + 260 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.39939e-07 0.00000e+00 + 261 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.56696e-07 0.00000e+00 + 262 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.92668e-07 0.00000e+00 + 263 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.07868e-07 0.00000e+00 + 264 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.31742e-07 0.00000e+00 + 265 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.50639e-07 0.00000e+00 + 266 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.65748e-07 0.00000e+00 + 267 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.87842e-07 0.00000e+00 + 268 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.80472e-08 0.00000e+00 + 269 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.65514e-08 0.00000e+00 + 270 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.49118e-08 0.00000e+00 + 271 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 7.15157e-08 0.00000e+00 + 272 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 1.88691e-07 0.00000e+00 + 273 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.07321e-07 0.00000e+00 + 274 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.25278e-07 0.00000e+00 + 275 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.45648e-07 0.00000e+00 + 276 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.04621e-07 0.00000e+00 + 277 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.27045e-07 0.00000e+00 + 278 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.50096e-07 0.00000e+00 + 279 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.64140e-07 0.00000e+00 + 280 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.15432e-08 0.00000e+00 + 281 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.37352e-08 0.00000e+00 + 282 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 6.42096e-08 0.00000e+00 + 283 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.01638e-07 0.00000e+00 + 284 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.22356e-07 0.00000e+00 + 285 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 2.36123e-07 0.00000e+00 + 286 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.17550e-07 0.00000e+00 + 287 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.46034e-07 0.00000e+00 + 288 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 4.69130e-07 0.00000e+00 + 289 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.77389e-09 0.00000e+00 + -1 \ No newline at end of file diff --git a/test/runtests.jl b/test/runtests.jl index 1f782d9..e9379f8 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -5,10 +5,6 @@ using Glob cd(@__DIR__) @show(pwd()) -@testset "UFFFiles.jl" begin - # Write your tests here. -end - readpath = "datasets" writepath = "written_datasets" @@ -17,9 +13,9 @@ writepath = "written_datasets" # Dataset15 @testset "dataset15" begin filename = "dataset15.unv" - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) @test ds[1].node_ID == ds1[1].node_ID @@ -32,9 +28,9 @@ end # Dataset18 @testset "dataset18" begin filename = "dataset18.unv" - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) @test ds[1].cs_num ≈ ds1[1].cs_num @@ -51,9 +47,9 @@ end # Dataset55 @testset "dataset55" begin filename = "dataset55.unv" - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) @test ds[1].id1 == ds1[1].id1 @@ -102,9 +98,9 @@ end for filename in filenames # println("Start $filename") filename = splitpath(filename)[end] - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) ab = ds[1].abscissa ≈ ds1[1].abscissa or = ds[1].data ≈ ds1[1].data @@ -146,9 +142,9 @@ end # Dataset82 @testset "dataset82" begin filename = "dataset82.unv" - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) @test ds[1].line_number == ds1[1].line_number @@ -161,9 +157,9 @@ end # Dataset151 @testset "dataset151" begin filename = "dataset151.unv" - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) @test ds[1].model_name == ds1[1].model_name @@ -182,9 +178,9 @@ end # Dataset164 @testset "dataset164" begin filename = "dataset164.unv" - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) @test ds[1].units == ds1[1].units @@ -194,15 +190,14 @@ end @test ds[1].conversion_force == ds1[1].conversion_force @test ds[1].conversion_temperature == ds1[1].conversion_temperature @test ds[1].conversion_temperature_offset == ds1[1].conversion_temperature_offset - end # Dataset1858 @testset "dataset1858" begin filename = "dataset1858.unv" - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) @test ds[1].set_record_number == ds1[1].set_record_number @@ -234,9 +229,9 @@ end # Dataset2411 @testset "dataset2411" begin filename = "dataset2411.unv" - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) @test ds[1].nodes_ID == ds1[1].nodes_ID @@ -251,9 +246,9 @@ end # Dataset2412 @testset "dataset2412" begin filename = "dataset2412.unv" - ds = readuff(joinpath(readpath, filename)); + ds = readuff(joinpath(readpath, filename)) writeuff(joinpath(writepath, filename), ds) - ds1 = readuff(joinpath(writepath, filename)); + ds1 = readuff(joinpath(writepath, filename)) rm(joinpath(writepath, filename)) @test ds[1].elements_ID == ds1[1].elements_ID @@ -298,6 +293,22 @@ end @test ntd(ds[1].data_info) == ntd(ds1[1].data_info) @test ntd(ds[1].data_value) == ntd(ds1[1].data_value) end + +@testset "convert_to_si" begin + # the dataset 55 is displacement + filename = "dataset151_164_58_55.unv" + ds = readuff(joinpath(readpath, filename)) + ds55data = 0.0254 .* ds[4].data + dss = deepcopy(ds) + convert_to_si!(dss) + + # a single test there are many more cases + @test ds55data ≈ dss[4].data + + ds58data = 0.0254/4.4482216152605 .* ds[3].data + @test ds58data ≈ dss[3].data +end + end diff --git a/test/written_datasets/dataset151_164_58_55.unv b/test/written_datasets/dataset151_164_58_55.unv new file mode 100644 index 0000000..61288f0 --- /dev/null +++ b/test/written_datasets/dataset151_164_58_55.unv @@ -0,0 +1,51 @@ + -1 + 151 +Test Universal File +File specific to show unit conversion capability of UFFFiles +Test for Ideas +17-Oct-25 14:58:08 0 0 0 +None None +Compatible to SDRC +03-Dec-25 08:07:07 + -1 + -1 + 164 + 7Inch (pound f) 2 + 3.93700787401574814E+01 2.24808943099710501E-01 1.80000000000000004E+00 + 4.59670000000000016E+02 + -1 + -1 + 58 +NONE +NONE +28-Jan-21 14:01:42 +NONE +NONE + 4 1 1 0 NONE 1 1 NONE 22 1 + 5 10 1 0.00000E+00 2.50000E-01 0.00000E+00 + 18 0 0 0 NONE NONE + 12 1 0 0 NONE NONE + 13 0 1 0 NONE NONE + 0 0 0 0 NONE NONE + 1.73331E-04 0.00000E+00 -5.45225E-07 -1.32963E-05 -1.37127E-06 -6.95395E-06 + -3.70260E-06 -1.21236E-06 -1.33769E-06 -5.04498E-07 1.33122E-06 -4.35957E-06 + -1.94365E-06 -9.69129E-07 -1.16043E-06 -3.54780E-06 -1.51112E-06 -3.34955E-07 + 9.80896E-07 -1.77917E-06 + -1 + -1 + 55 +Frequency band: 37Hz +Vib Displacement +NONE +NONE + 0 3 12 13 + 1 2 2 8 5 3 + 2 4 0 1 + 3.71094e+01 2.30193e+02 1.00000e+00 0.00000e+00 + 1 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 3.95048e-08 0.00000e+00 + 2 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.40412e-08 0.00000e+00 + 3 + 0.00000e+00 0.00000e+00 0.00000e+00 0.00000e+00 5.86622e-08 0.00000e+00 + -1