atmospheric 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37087fb5667af4c541517e07eafbfbea33358817fde87449127f6fec169ddca5
-  data.tar.gz: 5b1c7bbf20d5b62e1dffa40051290901b5a32c51a11675c2a8e29c2d73b0059c
+  metadata.gz: bf95b194179f8f4a0842f86dfbd015d592ce5996724ab676e4c7c68ea91cf5ae
+  data.tar.gz: 993855f78a4953b7bc4c6086253e6df7c1fccf95168f2c5d8768daa95cc8a2bc
 SHA512:
-  metadata.gz: 5db560cb6066be3598a074cdddbb361ba88e72c2ccf609e6f15b32882d27e600ae3ae2d908050f5685fb8b485f5c67a0312e4215c3f4f0e3d7c86ad95bc3aac8
-  data.tar.gz: 9086fa6c1208d11f8978aef849c19fa37279b57df39c25819c16640ad0a7c2dbd47e99f0b854f87a987d8a9de46ffe833f9af3aa64a7f065f5b83e89ba9a4b00
+  metadata.gz: b1cbe16fcfe115bb7070bdc1fa9b509a2dcc1c74f2de32637390fbcc64427e045531fba3f52097438ec71f17e61eac9a5a3199a8cd6f61b40e91bb51d8056c3b
+  data.tar.gz: 83871c6f2c5dc35dd4399563a4f69dad74e9a477c01af92dddefca66ca6bea8b8ac6562cf0b875ef2bafbc64975a3944b534e721bc3737871b6dfff0b9361ef5

data/README.adoc

@@ -54,7 +54,7 @@ The available methods are:
 
 All tables in the 1975 edition are arranged in these steps in meters:
 
-.ISO 2533:1975 table range: step 50 from -2k, 100 above 32k, 200 above 51k to 80k
+.ISO 2533:1975 table range: step 50 from -2k, 100 from 32k, 200 from 51k to 80k
 ----
 (-2000..31999).step(50) +
 (32000..50999).step(100) +
@@ -85,7 +85,7 @@ Provides the following values in addition to geopotential and geometric height:
 * `temperature-K`
 * `temperature-C`
 * `pressure-mbar`
-* `pressure-mmHg`
+* `pressure-mmhg`
 * `density`
 * `acceleration`
 
@@ -159,8 +159,8 @@ Provides:
 
 [source,ruby]
 ----
-Atmospheric::Export::HypsometricalTables.table_1      #=> Hash
-Atmospheric::Export::HypsometricalTables.table_1_yaml #=> YAML
+Atmospheric::Export::Iso25331985.table_1      #=> Hash
+Atmospheric::Export::Iso25331985.table_1_yaml #=> YAML
 ----
 
 ==== Table 2 (hPa)
@@ -173,8 +173,8 @@ Same as Table 1 but for the range of `(20.0..1199.9).step(0.1)` in hPa.
 
 [source,ruby]
 ----
-Atmospheric::Export::HypsometricalTables.table_2      #=> Hash
-Atmospheric::Export::HypsometricalTables.table_2_yaml #=> YAML
+Atmospheric::Export::Iso25331985.table_2      #=> Hash
+Atmospheric::Export::Iso25331985.table_2_yaml #=> YAML
 ----
 
 ==== Table 3 (mmHg)
@@ -192,8 +192,8 @@ Provides:
 
 [source,ruby]
 ----
-Atmospheric::Export::HypsometricalTables.table_3      #=> Hash
-Atmospheric::Export::HypsometricalTables.table_3_yaml #=> YAML
+Atmospheric::Export::Iso25331985.table_3      #=> Hash
+Atmospheric::Export::Iso25331985.table_3_yaml #=> YAML
 ----
 
 ==== Table 4 (mmHg)
@@ -206,8 +206,8 @@ Same as Table 3 but for the range of `(10.0..899.9).step(0.1)` and results in mm
 
 [source,ruby]
 ----
-Atmospheric::Export::HypsometricalTables.table_4      #=> Hash
-Atmospheric::Export::HypsometricalTables.table_4_yaml #=> YAML
+Atmospheric::Export::Iso25331985.table_4      #=> Hash
+Atmospheric::Export::Iso25331985.table_4_yaml #=> YAML
 ----
 
 ==== Table 5 (hPa) and Table 6 (mmHg)
@@ -228,8 +228,8 @@ Range of `(-1000..4599).step(1)`.
 
 [source,ruby]
 ----
-Atmospheric::Export::HypsometricalTables.table_56      #=> Hash
-Atmospheric::Export::HypsometricalTables.table_56_yaml #=> YAML
+Atmospheric::Export::Iso25331985.table_56      #=> Hash
+Atmospheric::Export::Iso25331985.table_56_yaml #=> YAML
 ----
 
 === ISO 2533 ADD 2:1997
@@ -351,6 +351,263 @@ Atmospheric::Export::Iso25331997.table_6_yaml #=> YAML
 ----
 
 
+=== ISO NP 2533:2024
+
+==== General
+
+ISO 2533 is now proposed to be revised for a 2024/2025 version, 49 years
+since the last edition (1975) and 27 years since it was last updated (1997).
+
+ISO NP 2533:2024 will likely include all content in the previously published
+Addenda, including:
+
+* Standard atmosphere values from altitude -5km to 80km (geometric and geopotential)
++
+NOTE: The 1975 edition provided values from -2km to 80km (even though it said 32km in the title).
++
+NOTE: The 1997 ADD 2 provided values from -5km to 2km.
+
+* Standard atmosphere values from altitude -16,500ft to 262,500ft (geometric and geopotential)
++
+NOTE: The 1997 ADD 2 provided these values.
+
+* Hypsometrical tables (altitude as a function of barometric pressure) (geometric and geopotential; hPa/mbar)
++
+NOTE: The 1985 ADD 1 provided these hypsometrical tables in hPa/mbar and mmHg.
+In the 2024 edition only hPa/mbar is provided.
+
+This document will also align to the values provided in
+https://store.icao.int/en/manual-of-the-icao-standard-atmosphere-extended-to-80-kilometres-262500-feet-doc-7488[ICAO Doc 7488/3].
+
+
+All tables in the new edition are arranged in these steps.
+
+.ISO 2533:2024 atmosphere values (m): step 50 from -5k, 100 from 32k, 200 from 51k to 80k
+----
+(-5000..31950).step(50) +
+(32000..50900).step(100) +
+(51000..80000).step(200)
+----
+
+.ISO 2533:2024 atmosphere values (ft): step 250 from -16500, 200 from -14000, 500 from 105000 to 262500
+----
+(-16500..-13750).step(250) +
+(-14000..104800).step(200) +
+(105000..262500).step(500)
+----
+
+Tables 5 to 10 all have height information of the following keys in the hash:
+
+* `geopotential-altitude-m`
+* `geopotential-altitude-ft`
+* `geometrical-altitude-m`
+* `geometrical-altitude-ft`
+
+All YAML tables generated contain these two keys which group altitude values
+as the ISO 2533 tables are rendered in both types of altitudes:
+
+* `by-geopotential-altitude`
+* `by-geometric-altitude`
+
+==== Table 5 (meters)
+
+NOTE: This corresponds to ISO 2533:1975 Table 5 combined with ISO 2533:1975/ADD
+1:1997 Table 1.
+
+Title:
+"_Temperature (T and t), Pressure (p), Density (p) and Acceleration of free fall
+(g) in terms of geometrical altitude (h) and geopotential altitude (H)_"
+
+Provides the following values in addition to geopotential and geometric height:
+
+* `temperature-K`
+* `temperature-C`
+* `pressure-mbar`
+* `pressure-mmhg`
+* `density`
+* `acceleration`
+
+[source,ruby]
+----
+Atmospheric::Export::Iso25332024.table_5      #=> Hash
+Atmospheric::Export::Iso25332024.table_5_yaml #=> YAML
+----
+
+==== Table 6 (meters)
+
+NOTE: This corresponds to ISO 2533:1975 Table 6 combined with ISO 2533:1975/ADD
+1:1997 Table 2.
+
+Title:
+"_Relations of p'pn, p/pn and bar(p/pn), Speed of sound (a), Dynamic viscosity
+(p), Kinematic viscosity (v) and Thermal conductivity (lambda) in terms of
+geometrical altitude (h), and geopotential altitude (H)_"
+
+Provides the following values in addition to geopotential and geometric height:
+
+* `ppn`
+* `rhorhon`
+* `sqrt-rhorhon`
+* `speed-of-sound`
+* `dynamic-viscosity`
+* `kinematic-viscosity`
+* `thermal-conductivity`
+
+[source,ruby]
+----
+Atmospheric::Export::Iso25332024.table_6      #=> Hash
+Atmospheric::Export::Iso25332024.table_6_yaml #=> YAML
+----
+
+==== Table 7 (meters)
+
+NOTE: This corresponds to ISO 2533:1975 Table 7 combined with ISO 2533:1975/ADD
+1:1997 Table 3.
+
+Title:
+"_Pressure scale height (H_p) Specific weight (gamma), Air number density (n),
+Mean air-particle speed (v), Air-particle collision frequency (omega) and Mean
+free path of air particles (l) in terms of geometrical altitude (h) and
+geopotential altitude (H)_"
+
+* `pressure-scale-height`
+* `specific-weight`
+* `air-number-density`
+* `mean-speed`
+* `frequency`
+* `mean-free-path`
+
+[source,ruby]
+----
+Atmospheric::Export::Iso25332024.table_7      #=> Hash
+Atmospheric::Export::Iso25332024.table_7_yaml #=> YAML
+----
+
+==== Table 8 (-16.5kft to 262.5kft)
+
+NOTE: This corresponds to ISO 2533:1975/ADD 2:1997 Table 4.
+
+Title:
+"_Temperature (T and t), pressure (p), density (p) and acceleration of free fall
+(g) in terms of geometrical altitude (h) and geopotential altitude (H) --
+Altitudes in feet_"
+
+Exactly same as ISO 2533:1975 Table 5, but in feet and different range.
+
+Pressure at mmHg is not produced, but the implementation still provides it
+for completeness.
+
+[source,ruby]
+----
+Atmospheric::Export::Iso25332024.table_8      #=> Hash
+Atmospheric::Export::Iso25332024.table_8_yaml #=> YAML
+----
+
+==== Table 9 (-16.5kft to 262.5kft)
+
+NOTE: This corresponds to ISO 2533:1975/ADD 2:1997 Table 5.
+
+Title:
+"_Relations of p'pn, p/pn and bar(p/pn), Speed of sound (a), Dynamic viscosity
+(p), Kinematic viscosity (v) and Thermal conductivity (lambda) in terms of
+geometrical altitude (h), and geopotential altitude (H) -- Altitudes in feet_"
+
+Exactly same as ISO 2533:1975 Table 6, but in feet and different range.
+
+[source,ruby]
+----
+Atmospheric::Export::Iso25332024.table_9      #=> Hash
+Atmospheric::Export::Iso25332024.table_9_yaml #=> YAML
+----
+
+==== Table 10 (-16.5kft to 262.5kft)
+
+NOTE: This corresponds to ISO 2533:1975/ADD 2:1997 Table 6.
+
+Title:
+"_Pressure scale height (H_p) Specific weight (gamma), Air number density (n),
+Mean air-particle speed (v), Air-particle collision frequency (omega) and Mean
+free path of air particles (l) in terms of geometrical altitude (h) and
+geopotential altitude (H) -- Altitudes in feet_"
+
+Exactly same as ISO 2533:1975 Table 7, but in feet and different range.
+
+[source,ruby]
+----
+Atmospheric::Export::Iso25332024.table_10      #=> Hash
+Atmospheric::Export::Iso25332024.table_10_yaml #=> YAML
+----
+
+
+==== Table 11 (hPa)
+
+NOTE: This corresponds to ISO 2533:1975/ADD 1:1985 Table 1 combined with Table 2.
+
+Title:
+"_Geopotential altitude as a function of barometric pressure
+for 5 <= p < 20 hPa at intervals of 0.01 hPa and
+20 <= p < 1200 hPa at intervals of 0.1 hPa__"
+
+For the range of `(5.0..19.99).step(0.01) + (20.0..1199.9).step(0.1)` in hPa.
+
+Provides:
+
+* `pressure-mbar`
+* `geopotential-altitude-m`
+
+[source,ruby]
+----
+Atmospheric::Export::Iso25332024.table_11      #=> Hash
+Atmospheric::Export::Iso25332024.table_11_yaml #=> YAML
+----
+
+
+==== Table 12 (hPa)
+
+NOTE: This corresponds to ISO 2533:1975/ADD 1:1985 Table 5 but in geometric altitude.
+
+Title:
+"_Barometric pressure, in hectopascals, as a function of geometric altitude
+for -1000 <= H < +4600 m at intervals of 1m_"
+
+Provides:
+
+* `geometric-altitude-m`
+* `pressure-mbar`
+* `pressure-mmhg`
+
+Range of `(-1000..4599).step(1)`.
+
+[source,ruby]
+----
+Atmospheric::Export::Iso25332024.table_12      #=> Hash
+Atmospheric::Export::Iso25332024.table_12_yaml #=> YAML
+----
+
+==== Table 13 (hPa)
+
+NOTE: This corresponds to ISO 2533:1975/ADD 1:1985 Table 5, in geopotential altitude.
+
+Title:
+"_Barometric pressure, in hectopascals, as a function of geopotential altitude
+for -1000 <= H < +4600 m at intervals of 1m_"
+
+Provides:
+
+* `geopotential-altitude-m`
+* `pressure-mbar`
+* `pressure-mmhg`
+
+Range of `(-1000..4599).step(1)`.
+
+[source,ruby]
+----
+Atmospheric::Export::Iso25332024.table_13      #=> Hash
+Atmospheric::Export::Iso25332024.table_13_yaml #=> YAML
+----
+
+
+
 == Testing
 
 [source,sh]

data/lib/atmospheric/export/hypsometrical_tables.rb

@@ -7,10 +7,10 @@ module Atmospheric
       class TableBase
         include Target
 
-        def to_h
+        def to_h(unit: steps_unit)
           d = { "rows" => [] }
           steps.each do |p|
-            d["rows"] << row(p)
+            d["rows"] << row(p, unit: unit)
           end
           d
         end
@@ -19,120 +19,15 @@ module Atmospheric
           (0..0)
         end
 
-        def row(p)
-          {}
-        end
-      end
-
-      class TableOne < TableBase
-        def steps
-          (5.0..19.99).step(0.01)
-        end
-
-        def row(p)
-          {
-            "pressure-mbar" => p.round(2),
-            "geopotential-altitude" => Isa.geopotential_altitude_from_pressure_mbar(p.round(2)).round,
-          }
-        end
-      end
-
-      class TableTwo < TableBase
-        def steps
-          (20.0..1199.9).step(0.1)
-        end
-
-        def row(p)
-          {
-            "pressure-mbar" => p.round(1),
-            "geopotential-altitude" => Isa.geopotential_altitude_from_pressure_mbar(p.round(1)).round,
-          }
-        end
-      end
-
-      class TableThree < TableBase
-        def steps
-          (4.0..9.99).step(0.01)
-        end
-
-        def row(p)
-          {
-            "pressure-mmhg" => p.round(2),
-            "geopotential-altitude" => Isa.geopotential_altitude_from_pressure_mmhg(p.round(2)).round,
-          }
-        end
-      end
-
-      class TableFour < TableBase
-        def steps
-          (10.0..899.9).step(0.1)
-        end
-
-        def row(p)
-          {
-            "pressure-mmhg" => p.round(1),
-            "geopotential-altitude" => Isa.geopotential_altitude_from_pressure_mmhg(p.round(1)).round,
-          }
-        end
-      end
-
-      class TableFiveSix < TableBase
-        def steps
-          (-1000..4599).step(1)
+        def steps_unit
+          :mbar
         end
 
-        def row(h)
-          {
-            "geopotential-altitude" => h,
-            "pressure-mbar" => round_to_sig_figs(Isa.pressure_from_geopotential_mbar(h.to_f), 6),
-            "pressure-mmhg" => round_to_sig_figs(Isa.pressure_from_geopotential_mmhg(h.to_f), 6),
-          }
+        def row(p, unit: steps_unit)
+          {}
         end
       end
 
-      class << self
-
-        def table_1
-          TableOne.new.to_h
-        end
-
-        def table_1_yaml
-          TableOne.new.to_yaml
-        end
-
-        def table_2
-          TableTwo.new.to_h
-        end
-
-        def table_2_yaml
-          TableTwo.new.to_yaml
-        end
-
-        def table_3
-          TableThree.new.to_h
-        end
-
-        def table_3_yaml
-          TableThree.new.to_yaml
-        end
-
-        def table_4
-          TableFour.new.to_h
-        end
-
-        def table_4_yaml
-          TableFour.new.to_yaml
-        end
-
-        def table_56
-          TableFiveSix.new.to_h
-        end
-
-        def table_56_yaml
-          TableFiveSix.new.to_yaml
-        end
-
-      end
     end
 
   end

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

@@ -17,7 +17,7 @@ module Atmospheric
             "temperature-K" => (Isa.temperature_at_layer_from_geopotential(gp_h_f) * 1000.0).round,
             "temperature-C" => (Isa.temperature_at_layer_celcius(gp_h_f) * 1000.0).round,
             "pressure-mbar" => round_to_sig_figs(Isa.pressure_from_geopotential_mbar(gp_h_f), 6),
-            "pressure-mmHg" => round_to_sig_figs(Isa.pressure_from_geopotential_mmhg(gp_h_f), 6),
+            "pressure-mmhg" => round_to_sig_figs(Isa.pressure_from_geopotential_mmhg(gp_h_f), 6),
             "density"       => round_to_sig_figs(Isa.density_from_geopotential(gp_h_f), 6),
             "acceleration"  => Isa.gravity_at_geopotential(gp_h_f).round(4),
           }

data/lib/atmospheric/export/iso_25331985.rb

@@ -0,0 +1,136 @@
+require_relative "./target"
+require_relative "./hypsometrical_tables"
+
+module Atmospheric
+  module Export
+
+    module Iso25331985
+
+      class TableOne < HypsometricalTables::TableBase
+        # TODO: when Ruby's step does not create inaccurate floating point numbers
+        # This is a hack to solve a Ruby bug with floating point calcuations
+        # > (20.0..1770.9).step(0.1).to_a
+        #  ...
+        #  1769.4,
+        #  1769.5,
+        #  1769.6000000000001, # <== we need to clean these
+        #  1769.7,
+        #  1769.8000000000002, # <== we need to clean these
+        # The last `map` should be removed if this bug is fixed
+        def steps
+          (5.0..19.99).step(0.01).to_a.map {|v| v.round(2)}
+        end
+
+        def steps_unit
+          :mbar
+        end
+
+        def row(p, unit: steps_unit)
+          method_name = "geopotential_altitude_from_pressure_#{unit}"
+          value = Isa.send(method_name, p).round
+          {
+            "pressure-#{unit}" => p,
+            "geopotential-altitude" => value,
+          }
+        end
+      end
+
+      class TableTwo < HypsometricalTables::TableBase
+        def steps
+          (20.0..1199.9).step(0.1).to_a.map {|v| v.round(1)}
+        end
+
+        def row(p, unit:)
+          method_name = "geopotential_altitude_from_pressure_#{unit}"
+          value = Isa.send(method_name, p).round
+          {
+            "pressure-#{unit}" => p,
+            "geopotential-altitude" => value,
+          }
+        end
+      end
+
+      # Same as Table 1 with mmHg
+      class TableThree < TableOne
+        def steps
+          (4.0..9.99).step(0.01).to_a.map {|v| v.round(2)}
+        end
+
+        def steps_unit
+          :mmhg
+        end
+      end
+
+      # Same as Table 3 with mmHg
+      class TableFour < TableTwo
+        def steps
+          (10.0..899.9).step(0.1).to_a.map {|v| v.round(1)}
+        end
+
+        def steps_unit
+          :mmhg
+        end
+      end
+
+      class TableFiveSix < HypsometricalTables::TableBase
+        def steps
+          (-1000..4599).step(1)
+        end
+
+        def row(h, unit:)
+          {
+            "geopotential-altitude" => h,
+            "pressure-mbar" => round_to_sig_figs(Isa.pressure_from_geopotential_mbar(h.to_f), 6),
+            "pressure-mmhg" => round_to_sig_figs(Isa.pressure_from_geopotential_mmhg(h.to_f), 6),
+          }
+        end
+      end
+
+      class << self
+
+        def table_1
+          TableOne.new.to_h
+        end
+
+        def table_1_yaml
+          TableOne.new.to_yaml
+        end
+
+        def table_2
+          TableTwo.new.to_h
+        end
+
+        def table_2_yaml
+          TableTwo.new.to_yaml
+        end
+
+        def table_3
+          TableThree.new.to_h
+        end
+
+        def table_3_yaml
+          TableThree.new.to_yaml
+        end
+
+        def table_4
+          TableFour.new.to_h
+        end
+
+        def table_4_yaml
+          TableFour.new.to_yaml
+        end
+
+        def table_56
+          TableFiveSix.new.to_h
+        end
+
+        def table_56_yaml
+          TableFiveSix.new.to_yaml
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/atmospheric/export/iso_25331997.rb

@@ -1,4 +1,5 @@
 require_relative "./target"
+require_relative "./iso_25331975"
 
 module Atmospheric
   module Export
@@ -26,8 +27,8 @@ module Atmospheric
       module GroupBaseFeet
         def steps
           (
-            (-16500..-13999).step(250) +
-            (-14000..104999).step(200) +
+            (-16500..-13750).step(250) +
+            (-14000..104800).step(200) +
             (105000..262500).step(500)
           )
         end