atmospheric 0.4.4 → 0.5.0

data/lib/atmospheric/export/altitude_attrs.rb

@@ -10,221 +10,282 @@ module Atmospheric
       include AltitudeConvertableModel
 
       # From Group One
-      attribute :temperature_k, UnitValueFloat
-      attribute :temperature_c, UnitValueFloat
-      attribute :pressure_mbar, UnitValueFloat
-      attribute :pressure_mmhg, UnitValueFloat
-      attribute :density, UnitValueFloat
-      attribute :acceleration, UnitValueFloat
+      attribute :temperatures, UnitValueFloat, collection: true
+      attribute :pressures, UnitValueFloat, collection: true
+      attribute :densities, UnitValueFloat, collection: true
+      attribute :accelerations, UnitValueFloat, collection: true
 
       # From Group Two
-      attribute :ppn, UnitValueFloat
-      attribute :rhorhon, UnitValueFloat
-      attribute :sqrt_rhorhon, UnitValueFloat
-      attribute :speed_of_sound, UnitValueFloat
-      attribute :dynamic_viscosity, UnitValueFloat
-      attribute :kinematic_viscosity, UnitValueFloat
-      attribute :thermal_conductivity, UnitValueFloat
+      attribute :ppns, UnitValueFloat, collection: true
+      attribute :rhorhons, UnitValueFloat, collection: true
+      attribute :sqrt_rhorhons, UnitValueFloat, collection: true
+      attribute :speeds_of_sound, UnitValueFloat, collection: true
+      attribute :dynamic_viscosities, UnitValueFloat, collection: true
+      attribute :kinematic_viscosities, UnitValueFloat, collection: true
+      attribute :thermal_conductivities, UnitValueFloat, collection: true
 
       # From Group Three
-      attribute :pressure_scale_height, UnitValueFloat
-      attribute :specific_weight, UnitValueFloat
-      attribute :air_number_density, UnitValueFloat
-      attribute :mean_speed, UnitValueFloat
-      attribute :frequency, UnitValueFloat
-      attribute :mean_free_path, UnitValueFloat
+      attribute :pressure_scale_heights, UnitValueFloat, collection: true
+      attribute :specific_weights, UnitValueFloat, collection: true
+      attribute :air_number_densities, UnitValueFloat, collection: true
+      attribute :mean_speeds, UnitValueFloat, collection: true
+      attribute :frequencies, UnitValueFloat, collection: true
+      attribute :mean_free_paths, UnitValueFloat, collection: true
+      attribute :precision, :string, values: %w[reduced normal high]
 
       key_value do
-        map "geometric-altitude-m", to: :geometric_altitude_m
-        map "geometric-altitude-ft", to: :geometric_altitude_ft
-        map "geopotential-altitude-m", to: :geopotential_altitude_m
-        map "geopotential-altitude-ft", to: :geopotential_altitude_ft
+        map "geometric-altitude", to: :geometric_altitudes
+        map "geopotential-altitude", to: :geopotential_altitudes
 
         # From Group One
-        map "temperature-k", to: :temperature_k
-        map "temperature-c", to: :temperature_c
-        map "pressure-mbar", to: :pressure_mbar
-        map "pressure-mmhg", to: :pressure_mmhg
-        map "density", to: :density
-        map "acceleration", to: :acceleration
+        map "temperature", to: :temperatures
+        map "pressure", to: :pressures
+        map "density", to: :densities
+        map "acceleration", to: :accelerations
 
         # From Group Two
-        map "ppn", to: :ppn
-        map "rhorhon", to: :rhorhon
-        map "sqrt-rhorhon", to: :sqrt_rhorhon
-        map "speed-of-sound", to: :speed_of_sound
-        map "dynamic-viscosity", to: :dynamic_viscosity
-        map "kinematic-viscosity", to: :kinematic_viscosity
-        map "thermal-conductivity", to: :thermal_conductivity
+        map "ppn", to: :ppns
+        map "rhorhon", to: :rhorhons
+        map "sqrt-rhorhon", to: :sqrt_rhorhons
+        map "speed-of-sound", to: :speeds_of_sound
+        map "dynamic-viscosity", to: :dynamic_viscosities
+        map "kinematic-viscosity", to: :kinematic_viscosities
+        map "thermal-conductivity", to: :thermal_conductivities
 
         # From Group Three
-        map "pressure-scale-height", to: :pressure_scale_height
-        map "specific-weight", to: :specific_weight
-        map "air-number-density", to: :air_number_density
-        map "mean-speed", to: :mean_speed
-        map "frequency", to: :frequency
-        map "mean-free-path", to: :mean_free_path
+        map "pressure-scale-height", to: :pressure_scale_heights
+        map "specific-weight", to: :specific_weights
+        map "air-number-density", to: :air_number_densities
+        map "mean-speed", to: :mean_speeds
+        map "frequency", to: :frequencies
+        map "mean-free-path", to: :mean_free_paths
+
+        map "precision", to: :precision
       end
 
       xml do
-        root "atmosphere-attributes"
-        map_element "geometric-altitude-m", to: :geometric_altitude_m
-        map_element "geometric-altitude-ft", to: :geometric_altitude_ft
-        map_element "geopotential-altitude-m", to: :geopotential_altitude_m
-        map_element "geopotential-altitude-ft", to: :geopotential_altitude_ft
+        element "atmosphere-attributes"
+        map_element "geometric-altitude", to: :geometric_altitudes
+        map_element "geopotential-altitude", to: :geopotential_altitudes
 
         # From Group One
-        map_element "temperature-k", to: :temperature_k
-        map_element "temperature-c", to: :temperature_c
-        map_element "pressure-mbar", to: :pressure_mbar
-        map_element "pressure-mmhg", to: :pressure_mmhg
-        map_element "density", to: :density
-        map_element "acceleration", to: :acceleration
+        map_element "temperature", to: :temperatures
+        map_element "pressure", to: :pressures
+        map_element "density", to: :densities
+        map_element "acceleration", to: :accelerations
 
         # From Group Two
-        map_element "ppn", to: :ppn
-        map_element "rhorhon", to: :rhorhon
-        map_element "sqrt-rhorhon", to: :sqrt_rhorhon
-        map_element "speed-of-sound", to: :speed_of_sound
-        map_element "dynamic-viscosity", to: :dynamic_viscosity
-        map_element "kinematic-viscosity", to: :kinematic_viscosity
-        map_element "thermal-conductivity", to: :thermal_conductivity
+        map_element "ppn", to: :ppns
+        map_element "rhorhon", to: :rhorhons
+        map_element "sqrt-rhorhon", to: :sqrt_rhorhons
+        map_element "speed-of-sound", to: :speeds_of_sound
+        map_element "dynamic-viscosity", to: :dynamic_viscosities
+        map_element "kinematic-viscosity", to: :kinematic_viscosities
+        map_element "thermal-conductivity", to: :thermal_conductivities
 
         # From Group Three
-        map_element "pressure-scale-height", to: :pressure_scale_height
-        map_element "specific-weight", to: :specific_weight
-        map_element "air-number-density", to: :air_number_density
-        map_element "mean-speed", to: :mean_speed
-        map_element "frequency", to: :frequency
-        map_element "mean-free-path", to: :mean_free_path
+        map_element "pressure-scale-height", to: :pressure_scale_heights
+        map_element "specific-weight", to: :specific_weights
+        map_element "air-number-density", to: :air_number_densities
+        map_element "mean-speed", to: :mean_speeds
+        map_element "frequency", to: :frequencies
+        map_element "mean-free-path", to: :mean_free_paths
+
+        map_element "precision", to: :precision
       end
 
       # In meters only
       def realize_values_from_geopotential(gp_h_m, precision: :reduced)
-        %i[
-          temperature_k temperature_c pressure_mbar pressure_mmhg density
-          acceleration ppn rhorhon sqrt_rhorhon speed_of_sound
-          dynamic_viscosity kinematic_viscosity thermal_conductivity
-          pressure_scale_height specific_weight air_number_density mean_speed
-          frequency mean_free_path
-        ].each do |attr|
-          v = calculate(gp_h_m, attr, precision: precision)
-          send("#{attr}=", v) if respond_to?("#{attr}=")
-        end
+        self.precision = precision.to_s
+
+        # Group One
+        self.temperatures = [
+          calculate(gp_h_m, :temperature_k, precision: precision),
+          calculate(gp_h_m, :temperature_c, precision: precision)
+        ]
+
+        self.pressures = [
+          calculate(gp_h_m, :pressure_mbar, precision: precision),
+          calculate(gp_h_m, :pressure_mmhg, precision: precision)
+        ]
+
+        self.densities = [
+          calculate(gp_h_m, :density, precision: precision)
+        ]
+
+        self.accelerations = [
+          calculate(gp_h_m, :acceleration, precision: precision)
+        ]
+
+        # Group Two
+        self.ppns = [
+          calculate(gp_h_m, :ppn, precision: precision)
+        ]
+
+        self.rhorhons = [
+          calculate(gp_h_m, :rhorhon, precision: precision)
+        ]
+
+        self.sqrt_rhorhons = [
+          calculate(gp_h_m, :sqrt_rhorhon, precision: precision)
+        ]
+
+        self.speeds_of_sound = [
+          calculate(gp_h_m, :speed_of_sound, precision: precision)
+        ]
+
+        self.dynamic_viscosities = [
+          calculate(gp_h_m, :dynamic_viscosity, precision: precision)
+        ]
+
+        self.kinematic_viscosities = [
+          calculate(gp_h_m, :kinematic_viscosity, precision: precision)
+        ]
+
+        self.thermal_conductivities = [
+          calculate(gp_h_m, :thermal_conductivity, precision: precision)
+        ]
+
+        # Group Three
+        self.pressure_scale_heights = [
+          calculate(gp_h_m, :pressure_scale_height, precision: precision)
+        ]
+
+        self.specific_weights = [
+          calculate(gp_h_m, :specific_weight, precision: precision)
+        ]
+
+        self.air_number_densities = [
+          calculate(gp_h_m, :air_number_density, precision: precision)
+        ]
+
+        self.mean_speeds = [
+          calculate(gp_h_m, :mean_speed, precision: precision)
+        ]
+
+        self.frequencies = [
+          calculate(gp_h_m, :frequency, precision: precision)
+        ]
+
+        self.mean_free_paths = [
+          calculate(gp_h_m, :mean_free_path, precision: precision)
+        ]
       end
 
       def calculate(gp_h_m, name, precision: :reduced)
+        isa = precision == :high ? Isa::HighPrecision.instance : Isa::NormalPrecision.instance
+
         case name
         when :temperature_k
-          v = Isa::NormalPrecision.instance.temperature_at_layer_from_geopotential(gp_h_m)
+          v = isa.temperature_at_layer_from_geopotential(gp_h_m)
           UnitValueFloat.new(
-            value: precision == :reduced ? (v * 1000.0).round : v,
+            value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
             unitsml: "K"
           )
         when :temperature_c
-          v = Isa::NormalPrecision.instance.temperature_at_layer_celcius(gp_h_m)
+          v = isa.temperature_at_layer_celcius(gp_h_m)
           UnitValueFloat.new(
-            value: precision == :reduced ? (v * 1000.0).round : v,
+            value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
             unitsml: "degC"
           )
         when :pressure_mbar
-          v = Isa::NormalPrecision.instance.pressure_from_geopotential_mbar(gp_h_m)
+          v = isa.pressure_from_geopotential_mbar(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
             unitsml: "mbar"
           )
         when :pressure_mmhg
-          v = Isa::NormalPrecision.instance.pressure_from_geopotential_mmhg(gp_h_m)
+          v = isa.pressure_from_geopotential_mmhg(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
-            unitsml: "u:mm_Hg"
+            unitsml: "mm_Hg"
           )
         when :density
-          v = Isa::NormalPrecision.instance.density_from_geopotential(gp_h_m)
+          v = isa.density_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
             unitsml: "kg*m^-3"
           )
         when :acceleration
-          v = Isa::NormalPrecision.instance.gravity_at_geopotential(gp_h_m)
+          v = isa.gravity_at_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? v.round(4) : v,
             unitsml: "m*s^-2"
           )
         when :ppn
-          v = Isa::NormalPrecision.instance.p_p_n_from_geopotential(gp_h_m)
+          v = isa.p_p_n_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
             unitsml: nil
           )
         when :rhorhon
-          v = Isa::NormalPrecision.instance.rho_rho_n_from_geopotential(gp_h_m)
+          v = isa.rho_rho_n_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
             unitsml: nil
           )
         when :sqrt_rhorhon
-          v = Isa::NormalPrecision.instance.root_rho_rho_n_from_geopotential(gp_h_m)
+          v = isa.root_rho_rho_n_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
             unitsml: nil
           )
         when :speed_of_sound
-          v = Isa::NormalPrecision.instance.speed_of_sound_from_geopotential(gp_h_m)
+          v = isa.speed_of_sound_from_geopotential(gp_h_m)
           UnitValueFloat.new(
-            value: precision == :reduced ? (v * 1000.0).round : v,
+            value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
             unitsml: "m*s^-1"
           )
         when :dynamic_viscosity
-          v = Isa::NormalPrecision.instance.dynamic_viscosity_from_geopotential(gp_h_m)
+          v = isa.dynamic_viscosity_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
             unitsml: "Pa*s"
           )
         when :kinematic_viscosity
-          v = Isa::NormalPrecision.instance.kinematic_viscosity_from_geopotential(gp_h_m)
+          v = isa.kinematic_viscosity_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
             unitsml: "m^2*s^-1"
           )
         when :thermal_conductivity
-          v = Isa::NormalPrecision.instance.thermal_conductivity_from_geopotential(gp_h_m)
+          v = isa.thermal_conductivity_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
             unitsml: "W*m^-1*K^-1"
           )
         when :pressure_scale_height
-          v = Isa::NormalPrecision.instance.pressure_scale_height_from_geopotential(gp_h_m)
+          v = isa.pressure_scale_height_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? v.round(1) : v,
             unitsml: "m"
           )
         when :specific_weight
-          v = Isa::NormalPrecision.instance.specific_weight_from_geopotential(gp_h_m)
+          v = isa.specific_weight_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
             unitsml: "N*m^-3"
           )
         when :air_number_density
-          v = Isa::NormalPrecision.instance.air_number_density_from_geopotential(gp_h_m)
+          v = isa.air_number_density_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
             unitsml: "m^-3"
           )
         when :mean_speed
-          v = Isa::NormalPrecision.instance.mean_air_particle_speed_from_geopotential(gp_h_m)
+          v = isa.mean_air_particle_speed_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? v.round(2) : v,
             unitsml: "m*s^-1"
           )
         when :frequency
-          v = Isa::NormalPrecision.instance.air_particle_collision_frequency_from_geopotential(gp_h_m)
+          v = isa.air_particle_collision_frequency_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
             unitsml: "s^-1"
           )
         when :mean_free_path
-          v = Isa::NormalPrecision.instance.mean_free_path_of_air_particles_from_geopotential(gp_h_m)
+          v = isa.mean_free_path_of_air_particles_from_geopotential(gp_h_m)
           UnitValueFloat.new(
             value: precision == :reduced ? round_to_sig_figs(v, 5) : v,
             unitsml: "m"

data/lib/atmospheric/export/altitude_convertable_model.rb

@@ -11,10 +11,8 @@ module Atmospheric
 
       def self.included(base)
         base.class_eval do
-          attribute :geometric_altitude_m, UnitValueInteger
-          attribute :geometric_altitude_ft, UnitValueInteger
-          attribute :geopotential_altitude_m, UnitValueInteger
-          attribute :geopotential_altitude_ft, UnitValueInteger
+          attribute :geometric_altitudes, UnitValueInteger, collection: true
+          attribute :geopotential_altitudes, UnitValueInteger, collection: true
         end
       end
 
@@ -54,25 +52,27 @@ module Atmospheric
       end
 
       def realize_altitudes(hgmm, hgmf, hgpm, hgpf, precision: :reduced)
-        self.geometric_altitude_m = UnitValueInteger.new(
-          value: precision == :reduced ? hgmm.round : hgmm,
-          unitsml: "m"
-        )
+        self.geometric_altitudes = [
+          UnitValueInteger.new(
+            value: precision == :reduced ? hgmm.round : hgmm,
+            unitsml: "m"
+          ),
+          UnitValueInteger.new(
+            value: precision == :reduced ? hgmf.round : hgmf,
+            unitsml: "ft"
+          )
+        ]
 
-        self.geometric_altitude_ft = UnitValueInteger.new(
-          value: precision == :reduced ? hgmf.round : hgmf,
-          unitsml: "ft"
-        )
-
-        self.geopotential_altitude_m = UnitValueInteger.new(
-          value: precision == :reduced ? hgpm.round : hgpm,
-          unitsml: "m"
-        )
-
-        self.geopotential_altitude_ft = UnitValueInteger.new(
-          value: precision == :reduced ? hgpf.round : hgpf,
-          unitsml: "ft"
-        )
+        self.geopotential_altitudes = [
+          UnitValueInteger.new(
+            value: precision == :reduced ? hgpm.round : hgpm,
+            unitsml: "m"
+          ),
+          UnitValueInteger.new(
+            value: precision == :reduced ? hgpf.round : hgpf,
+            unitsml: "ft"
+          )
+        ]
       end
 
       def realize_values_from_geopotential(gp_h_m, precision:)

data/lib/atmospheric/export/hypsometrical_table.rb

@@ -9,7 +9,7 @@ module Atmospheric
       attribute :rows, PressureAttrs, collection: true
 
       xml do
-        root "atmospheric"
+        element "atmospheric"
         map_element "hypsometrical-attributes", to: :rows
       end
 

data/lib/atmospheric/export/iso_25331975/group_one_attrs.rb

@@ -9,71 +9,87 @@ module Atmospheric
       class GroupOneAttrs < Lutaml::Model::Serializable
         include AltitudeConvertableModel
 
-        attribute :temperature_k, UnitValueInteger
-        attribute :temperature_c, UnitValueInteger
-        attribute :pressure_mbar, UnitValueFloat
-        attribute :pressure_mmhg, UnitValueFloat
-        attribute :density, UnitValueFloat
-        attribute :acceleration, UnitValueFloat
+        attribute :temperatures, UnitValueInteger, collection: true
+        attribute :pressures, UnitValueFloat, collection: true
+        attribute :densities, UnitValueFloat, collection: true
+        attribute :accelerations, UnitValueFloat, collection: true
 
         key_value do
-          map "geometric-altitude-m", to: :geometric_altitude_m
-          map "geometric-altitude-ft", to: :geometric_altitude_ft
-          map "geopotential-altitude-m", to: :geopotential_altitude_m
-          map "geopotential-altitude-ft", to: :geopotential_altitude_ft
-          map "temperature-k", to: :temperature_k
-          map "temperature-c", to: :temperature_c
-          map "pressure-mbar", to: :pressure_mbar
-          map "pressure-mmhg", to: :pressure_mmhg
-          map "density", to: :density
-          map "acceleration", to: :acceleration
+          map "geometric-altitude", to: :geometric_altitudes
+          map "geopotential-altitude", to: :geopotential_altitudes
+          map "temperature", to: :temperatures
+          map "pressure", to: :pressures
+          map "density", to: :densities
+          map "acceleration", to: :accelerations
+        end
+
+        xml do
+          element "group-one-attrs"
+          map_element "geometric-altitude", to: :geometric_altitudes
+          map_element "geopotential-altitude", to: :geopotential_altitudes
+          map_element "temperature", to: :temperatures
+          map_element "pressure", to: :pressures
+          map_element "density", to: :densities
+          map_element "acceleration", to: :accelerations
         end
 
         # In meters only
         def realize_values_from_geopotential(gp_h_m, precision: :reduced)
-          %i[
-            temperature_k temperature_c pressure_mbar pressure_mmhg density
-            acceleration
-          ].each do |attr|
-            v = calculate(gp_h_m, attr, precision: precision)
-            send("#{attr}=", v) if respond_to?("#{attr}=")
-          end
+          self.temperatures = [
+            calculate(gp_h_m, :temperature_k, precision: precision),
+            calculate(gp_h_m, :temperature_c, precision: precision)
+          ]
+
+          self.pressures = [
+            calculate(gp_h_m, :pressure_mbar, precision: precision),
+            calculate(gp_h_m, :pressure_mmhg, precision: precision)
+          ]
+
+          self.densities = [
+            calculate(gp_h_m, :density, precision: precision)
+          ]
+
+          self.accelerations = [
+            calculate(gp_h_m, :acceleration, precision: precision)
+          ]
         end
 
         def calculate(gp_h_m, name, precision: :reduced)
+          isa = precision == :high ? Isa::HighPrecision.instance : Isa::NormalPrecision.instance
+
           case name
           when :temperature_k
-            v = Isa::NormalPrecision.instance.temperature_at_layer_from_geopotential(gp_h_m)
+            v = isa.temperature_at_layer_from_geopotential(gp_h_m)
             UnitValueInteger.new(
               value: precision == :reduced ? (v * 1000.0).round : v,
               unitsml: "K"
             )
           when :temperature_c
-            v = Isa::NormalPrecision.instance.temperature_at_layer_celcius(gp_h_m)
+            v = isa.temperature_at_layer_celcius(gp_h_m)
             UnitValueInteger.new(
               value: precision == :reduced ? (v * 1000.0).round : v,
               unitsml: "degC"
             )
           when :pressure_mbar
-            v = Isa::NormalPrecision.instance.pressure_from_geopotential_mbar(gp_h_m)
+            v = isa.pressure_from_geopotential_mbar(gp_h_m)
             UnitValueFloat.new(
               value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
               unitsml: "mbar"
             )
           when :pressure_mmhg
-            v = Isa::NormalPrecision.instance.pressure_from_geopotential_mmhg(gp_h_m)
+            v = isa.pressure_from_geopotential_mmhg(gp_h_m)
             UnitValueFloat.new(
               value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
-              unitsml: "u:mm_Hg"
+              unitsml: "mm_Hg"
             )
           when :density
-            v = Isa::NormalPrecision.instance.density_from_geopotential(gp_h_m)
+            v = isa.density_from_geopotential(gp_h_m)
             UnitValueFloat.new(
               value: precision == :reduced ? round_to_sig_figs(v, 6) : v,
               unitsml: "kg*m^-3"
             )
           when :acceleration
-            v = Isa::NormalPrecision.instance.gravity_at_geopotential(gp_h_m)
+            v = isa.gravity_at_geopotential(gp_h_m)
             UnitValueFloat.new(
               value: precision == :reduced ? v.round(4) : v,
               unitsml: "m*s^-2"