jerlov 0.5.2__tar.gz → 0.6.0__tar.gz

{jerlov-0.5.2/jerlov.egg-info → jerlov-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jerlov
-Version: 0.5.2
+Version: 0.6.0
 Summary: Inherent optical properties of Jerlov water types, with provenance
 Author: T. Ishibashi
 License-Expression: Apache-2.0
@@ -244,6 +244,18 @@ jerlov.water_type_at_depth("9C", 15.0)    # None: the paper declined to say
 nothing is asserted. This is a lookup, not a correction applied on your
 behalf.
 
+To carry the downwelling irradiance down through that profile, with each 10 m
+layer attenuating by the Kd of its own type:
+
+```python
+d = jerlov.descend("1C", 45.0, wl)        # source="jerlov1976" by default
+d.layers          # ((0, 10, '1C'), (10, 20, '1C'), (20, 30, 'III'), ..., (40, 45, 'II'))
+scene = jerlov.Scene(jerlov.water("II"), surface * d.transmittance, wl, depth_m=45.0)
+```
+
+It refuses to go through a layer the paper declared nothing for, rather than
+carrying the last type on: 3C stops at 70 m, 9C at 10 m.
+
 ## Other entry points
 
 ```python
@@ -257,8 +269,15 @@ jerlov.pure_water_scattering(555)   # Morel's bw, if that is what c was correcte
 # The measured points behind the williamson2022 spectra, with their spread.
 m = jerlov.measured_points("III", "a")   # m.wavelengths, m.values, m.std_dev
 
-# Use your own measurements; they take exactly the same path.
-jerlov.Water.from_measurements(wavelengths, a=..., b=...)
+# The pure water absorption williamson2022 built its a on (300-800 nm).
+jerlov.pure_water_absorption(440)        # 0.0104; other sources say why they have none
+
+# Use your own measurements; they take exactly the same path, flags included.
+w = jerlov.Water.from_measurements(
+    wavelengths, a=..., b=...,
+    flags={"a": statuses},             # "ok", "suspect", ...: as in DATA.md; flagged ones warn
+    uncertainty={"a": sigma_a},        # 1/m; w.uncertainty("a", 532)
+)
 ```
 
 ## Solar heating of the upper ocean
@@ -302,7 +321,7 @@ made.
 ## Provenance and design
 
 `DATA.md` records, for every shipped table, where it came from, what was
-verified, and what is known to be wrong with it. Nineteen entries are
+verified, and what is known to be wrong with it. Twenty entries are
 documented there: eight confirmed defects in the source literature, three
 questions the first edition of Jerlov settled, and the rest notes.
 

{jerlov-0.5.2 → jerlov-0.6.0}/README.md

@@ -219,6 +219,18 @@ jerlov.water_type_at_depth("9C", 15.0)    # None: the paper declined to say
 nothing is asserted. This is a lookup, not a correction applied on your
 behalf.
 
+To carry the downwelling irradiance down through that profile, with each 10 m
+layer attenuating by the Kd of its own type:
+
+```python
+d = jerlov.descend("1C", 45.0, wl)        # source="jerlov1976" by default
+d.layers          # ((0, 10, '1C'), (10, 20, '1C'), (20, 30, 'III'), ..., (40, 45, 'II'))
+scene = jerlov.Scene(jerlov.water("II"), surface * d.transmittance, wl, depth_m=45.0)
+```
+
+It refuses to go through a layer the paper declared nothing for, rather than
+carrying the last type on: 3C stops at 70 m, 9C at 10 m.
+
 ## Other entry points
 
 ```python
@@ -232,8 +244,15 @@ jerlov.pure_water_scattering(555)   # Morel's bw, if that is what c was correcte
 # The measured points behind the williamson2022 spectra, with their spread.
 m = jerlov.measured_points("III", "a")   # m.wavelengths, m.values, m.std_dev
 
-# Use your own measurements; they take exactly the same path.
-jerlov.Water.from_measurements(wavelengths, a=..., b=...)
+# The pure water absorption williamson2022 built its a on (300-800 nm).
+jerlov.pure_water_absorption(440)        # 0.0104; other sources say why they have none
+
+# Use your own measurements; they take exactly the same path, flags included.
+w = jerlov.Water.from_measurements(
+    wavelengths, a=..., b=...,
+    flags={"a": statuses},             # "ok", "suspect", ...: as in DATA.md; flagged ones warn
+    uncertainty={"a": sigma_a},        # 1/m; w.uncertainty("a", 532)
+)
 ```
 
 ## Solar heating of the upper ocean
@@ -277,7 +296,7 @@ made.
 ## Provenance and design
 
 `DATA.md` records, for every shipped table, where it came from, what was
-verified, and what is known to be wrong with it. Nineteen entries are
+verified, and what is known to be wrong with it. Twenty entries are
 documented there: eight confirmed defects in the source literature, three
 questions the first edition of Jerlov settled, and the rest notes.
 

{jerlov-0.5.2 → jerlov-0.6.0}/jerlov/__init__.py

@@ -37,13 +37,16 @@ from .shortwave import (
 )
 from .sources import SOURCES, Source, get_source
 from .water import (
+    Descent,
     MeasuredPoints,
     MissingQuantityError,
     ProvenanceWarning,
     Water,
     b_from_c,
+    descend,
     kd_spectrum,
     measured_points,
+    pure_water_absorption,
     water,
     water_type_at_depth,
 )
@@ -67,6 +70,9 @@ __all__ = [
     "Water",
     "water",
     "water_type_at_depth",
+    "descend",
+    "Descent",
+    "pure_water_absorption",
     "shortwave_parameters",
     "solar_fraction",
     "jerlov1968_solar_fraction",
@@ -86,4 +92,4 @@ __all__ = [
     "MissingQuantityError",
 ]
 
-__version__ = "0.5.2"
+__version__ = "0.6.0"

{jerlov-0.5.2 → jerlov-0.6.0}/jerlov/_data.py

@@ -59,6 +59,10 @@ QUESTIONABLE = frozenset({"suspect", "missing", "extrapolated",
                           "model_extrapolation", "reconstructed",
                           "extrapolated_by_dataset"})
 
+#: Every status a spectrum can carry: the table in DATA.md, "The status
+#: column". A caller's own flags must be one of these.
+STATUSES = QUESTIONABLE | {"ok", "interpolated"}
+
 
 def _read(name: str) -> list[dict[str, str]]:
     path = resources.files("jerlov.data").joinpath(name)

{jerlov-0.5.2 → jerlov-0.6.0}/jerlov/backscattering.py

@@ -57,6 +57,20 @@ class AngleWarning(UserWarning):
     """
 
 
+def _amplitude(wavelength_nm, salinity_psu) -> np.ndarray:
+    """Morel's A(lambda, S), Boss & Pegau Eq. (4), in 1/(m sr)."""
+    salinity = np.asarray(salinity_psu, dtype=float)
+    if not np.all(np.isfinite(salinity)) or np.any(salinity < 0):
+        # A negative salinity made pure water scatter less than fresh water,
+        # without complaint.
+        raise ValueError(
+            f"salinity_psu must be a finite number, 0 or more, not "
+            f"{salinity_psu!r}"
+        )
+    return (1.38 * (np.asarray(wavelength_nm, dtype=float) / 500.0) ** -4.32
+            * (1 + 0.3 * salinity / 37.0) * 1e-4)
+
+
 def _ratio() -> float:
     return (1 - DEPOLARISATION_RATIO) / (1 + DEPOLARISATION_RATIO)
 
@@ -73,8 +87,7 @@ def pure_water_vsf(angle_deg, wavelength_nm, salinity_psu: float = 37.0):
     as the agreement between measurement and theory.
     """
     angle = np.asarray(angle_deg, dtype=float)
-    amplitude = (1.38 * (np.asarray(wavelength_nm, dtype=float) / 500.0) ** -4.32
-                 * (1 + 0.3 * salinity_psu / 37.0) * 1e-4)
+    amplitude = _amplitude(wavelength_nm, salinity_psu)
     out = amplitude * (1 + _ratio() * np.cos(np.radians(angle)) ** 2)
     # Angle and wavelength broadcast against each other; the answer is a
     # float only when neither of them was an array.
@@ -90,8 +103,7 @@ def pure_water_backscattering(wavelength_nm, salinity_psu: float = 37.0):
     hemisphere, which for this angular shape is analytic.
     """
     r = _ratio()
-    amplitude = (1.38 * (np.asarray(wavelength_nm, dtype=float) / 500.0) ** -4.32
-                 * (1 + 0.3 * salinity_psu / 37.0) * 1e-4)
+    amplitude = _amplitude(wavelength_nm, salinity_psu)
     # integral of (1 + r cos^2) sin over 90..180 degrees is 1 + r/3
     out = 2.0 * math.pi * amplitude * (1 + r / 3.0)
     return _like_input(np.atleast_1d(out), wavelength_nm)

jerlov-0.6.0/jerlov/data/williamson2022_aw.csv

@@ -0,0 +1,502 @@
+wavelength_nm,aw_per_m,unit,status,note
+300,0.0382,1/m,ok,
+301,0.03715,1/m,ok,
+302,0.0361,1/m,ok,
+303,0.0351,1/m,ok,
+304,0.0341,1/m,ok,
+305,0.0332,1/m,ok,
+306,0.0323,1/m,ok,
+307,0.0314,1/m,ok,
+308,0.0305,1/m,ok,
+309,0.02965,1/m,ok,
+310,0.0288,1/m,ok,
+311,0.028,1/m,ok,
+312,0.0272,1/m,ok,
+313,0.02645,1/m,ok,
+314,0.0257,1/m,ok,
+315,0.02495,1/m,ok,
+316,0.0242,1/m,ok,
+317,0.0235,1/m,ok,
+318,0.0228,1/m,ok,
+319,0.02215,1/m,ok,
+320,0.0215,1/m,ok,
+321,0.0209,1/m,ok,
+322,0.0203,1/m,ok,
+323,0.0197,1/m,ok,
+324,0.0191,1/m,ok,
+325,0.01855,1/m,ok,
+326,0.018,1/m,ok,
+327,0.0175,1/m,ok,
+328,0.017,1/m,ok,
+329,0.0165,1/m,ok,
+330,0.016,1/m,ok,
+331,0.01555,1/m,ok,
+332,0.0151,1/m,ok,
+333,0.01465,1/m,ok,
+334,0.0142,1/m,ok,
+335,0.0138,1/m,ok,
+336,0.0134,1/m,ok,
+337,0.01305,1/m,ok,
+338,0.0127,1/m,ok,
+339,0.0123,1/m,ok,
+340,0.0119,1/m,ok,
+341,0.0116,1/m,ok,
+342,0.0113,1/m,ok,
+343,0.011,1/m,ok,
+344,0.0107,1/m,ok,
+345,0.0104,1/m,ok,
+346,0.0101,1/m,ok,
+347,0.00985,1/m,ok,
+348,0.0096,1/m,ok,
+349,0.00935,1/m,ok,
+350,0.0091,1/m,ok,
+351,0.00885,1/m,ok,
+352,0.0086,1/m,ok,
+353,0.0084,1/m,ok,
+354,0.0082,1/m,ok,
+355,0.008,1/m,ok,
+356,0.0078,1/m,ok,
+357,0.00765,1/m,ok,
+358,0.0075,1/m,ok,
+359,0.0073,1/m,ok,
+360,0.0071,1/m,ok,
+361,0.007,1/m,ok,
+362,0.0069,1/m,ok,
+363,0.00675,1/m,ok,
+364,0.0066,1/m,ok,
+365,0.0065,1/m,ok,
+366,0.0064,1/m,ok,
+367,0.0063,1/m,ok,
+368,0.0062,1/m,ok,
+369,0.0061,1/m,ok,
+370,0.006,1/m,ok,
+371,0.0059,1/m,ok,
+372,0.0058,1/m,ok,
+373,0.00575,1/m,ok,
+374,0.0057,1/m,ok,
+375,0.00565,1/m,ok,
+376,0.0056,1/m,ok,
+377,0.00555,1/m,ok,
+378,0.0055,1/m,ok,
+379,0.00545,1/m,ok,
+380,0.0054,1/m,ok,
+381,0.0054,1/m,ok,
+382,0.0054,1/m,ok,
+383,0.00535,1/m,ok,
+384,0.0053,1/m,ok,
+385,0.0053,1/m,ok,
+386,0.0053,1/m,ok,
+387,0.0053,1/m,ok,
+388,0.0053,1/m,ok,
+389,0.00535,1/m,ok,
+390,0.0054,1/m,ok,
+391,0.0054,1/m,ok,
+392,0.0054,1/m,ok,
+393,0.0054,1/m,ok,
+394,0.0054,1/m,ok,
+395,0.00545,1/m,ok,
+396,0.0055,1/m,ok,
+397,0.00555,1/m,ok,
+398,0.0056,1/m,ok,
+399,0.0057,1/m,ok,
+400,0.0058,1/m,ok,
+401,0.00585,1/m,ok,
+402,0.0059,1/m,ok,
+403,0.006,1/m,ok,
+404,0.0061,1/m,ok,
+405,0.0062,1/m,ok,
+406,0.0063,1/m,ok,
+407,0.0064,1/m,ok,
+408,0.0065,1/m,ok,
+409,0.0066,1/m,ok,
+410,0.0067,1/m,ok,
+411,0.0068,1/m,ok,
+412,0.0069,1/m,ok,
+413,0.00705,1/m,ok,
+414,0.0072,1/m,ok,
+415,0.0073,1/m,ok,
+416,0.0074,1/m,ok,
+417,0.0075,1/m,ok,
+418,0.0076,1/m,ok,
+419,0.00775,1/m,ok,
+420,0.0079,1/m,ok,
+421,0.00805,1/m,ok,
+422,0.0082,1/m,ok,
+423,0.0083,1/m,ok,
+424,0.0084,1/m,ok,
+425,0.00855,1/m,ok,
+426,0.0087,1/m,ok,
+427,0.0088,1/m,ok,
+428,0.0089,1/m,ok,
+429,0.00905,1/m,ok,
+430,0.0092,1/m,ok,
+431,0.0093,1/m,ok,
+432,0.0094,1/m,ok,
+433,0.00955,1/m,ok,
+434,0.0097,1/m,ok,
+435,0.0098,1/m,ok,
+436,0.0099,1/m,ok,
+437,0.01005,1/m,ok,
+438,0.0102,1/m,ok,
+439,0.0103,1/m,ok,
+440,0.0104,1/m,ok,
+441,0.0105,1/m,ok,
+442,0.0106,1/m,ok,
+443,0.0107,1/m,ok,
+444,0.0108,1/m,ok,
+445,0.0109,1/m,ok,
+446,0.011,1/m,ok,
+447,0.0111,1/m,ok,
+448,0.0112,1/m,ok,
+449,0.0113,1/m,ok,
+450,0.0114,1/m,ok,
+451,0.0115,1/m,ok,
+452,0.0116,1/m,ok,
+453,0.0117,1/m,ok,
+454,0.0118,1/m,ok,
+455,0.0119,1/m,ok,
+456,0.012,1/m,ok,
+457,0.0121,1/m,ok,
+458,0.0122,1/m,ok,
+459,0.0123,1/m,ok,
+460,0.0124,1/m,ok,
+461,0.0125,1/m,ok,
+462,0.0126,1/m,ok,
+463,0.0127,1/m,ok,
+464,0.0128,1/m,ok,
+465,0.0129,1/m,ok,
+466,0.013,1/m,ok,
+467,0.01315,1/m,ok,
+468,0.0133,1/m,ok,
+469,0.0134,1/m,ok,
+470,0.0135,1/m,ok,
+471,0.01365,1/m,ok,
+472,0.0138,1/m,ok,
+473,0.01395,1/m,ok,
+474,0.0141,1/m,ok,
+475,0.01425,1/m,ok,
+476,0.0144,1/m,ok,
+477,0.0146,1/m,ok,
+478,0.0148,1/m,ok,
+479,0.015,1/m,ok,
+480,0.0152,1/m,ok,
+481,0.01545,1/m,ok,
+482,0.0157,1/m,ok,
+483,0.01595,1/m,ok,
+484,0.0162,1/m,ok,
+485,0.01645,1/m,ok,
+486,0.0167,1/m,ok,
+487,0.01705,1/m,ok,
+488,0.0174,1/m,ok,
+489,0.01775,1/m,ok,
+490,0.0181,1/m,ok,
+491,0.0185,1/m,ok,
+492,0.0189,1/m,ok,
+493,0.01935,1/m,ok,
+494,0.0198,1/m,ok,
+495,0.02035,1/m,ok,
+496,0.0209,1/m,ok,
+497,0.0216,1/m,ok,
+498,0.0223,1/m,ok,
+499,0.02305,1/m,ok,
+500,0.0238,1/m,ok,
+501,0.02465,1/m,ok,
+502,0.0255,1/m,ok,
+503,0.0264,1/m,ok,
+504,0.0273,1/m,ok,
+505,0.0282,1/m,ok,
+506,0.0291,1/m,ok,
+507,0.03005,1/m,ok,
+508,0.031,1/m,ok,
+509,0.03195,1/m,ok,
+510,0.0329,1/m,ok,
+511,0.0339,1/m,ok,
+512,0.0349,1/m,ok,
+513,0.03585,1/m,ok,
+514,0.0368,1/m,ok,
+515,0.0377,1/m,ok,
+516,0.0386,1/m,ok,
+517,0.0395,1/m,ok,
+518,0.0404,1/m,ok,
+519,0.04065,1/m,ok,
+520,0.0409,1/m,ok,
+521,0.04125,1/m,ok,
+522,0.0416,1/m,ok,
+523,0.04125,1/m,ok,
+524,0.0409,1/m,ok,
+525,0.0418,1/m,ok,
+526,0.0427,1/m,ok,
+527,0.0425,1/m,ok,
+528,0.0423,1/m,ok,
+529,0.0426,1/m,ok,
+530,0.0429,1/m,ok,
+531,0.0437,1/m,ok,
+532,0.0445,1/m,ok,
+533,0.04505,1/m,ok,
+534,0.0456,1/m,ok,
+535,0.0463,1/m,ok,
+536,0.047,1/m,ok,
+537,0.0475,1/m,ok,
+538,0.048,1/m,ok,
+539,0.04875,1/m,ok,
+540,0.0495,1/m,ok,
+541,0.0499,1/m,ok,
+542,0.0503,1/m,ok,
+543,0.0515,1/m,ok,
+544,0.0527,1/m,ok,
+545,0.05355,1/m,ok,
+546,0.0544,1/m,ok,
+547,0.0554,1/m,ok,
+548,0.0564,1/m,ok,
+549,0.0576,1/m,ok,
+550,0.0588,1/m,ok,
+551,0.05995,1/m,ok,
+552,0.0611,1/m,ok,
+553,0.0621,1/m,ok,
+554,0.0631,1/m,ok,
+555,0.06385,1/m,ok,
+556,0.0646,1/m,ok,
+557,0.0652,1/m,ok,
+558,0.0658,1/m,ok,
+559,0.0665,1/m,ok,
+560,0.0672,1/m,ok,
+561,0.0679,1/m,ok,
+562,0.0686,1/m,ok,
+563,0.06925,1/m,ok,
+564,0.0699,1/m,ok,
+565,0.07085,1/m,ok,
+566,0.0718,1/m,ok,
+567,0.0726,1/m,ok,
+568,0.0734,1/m,ok,
+569,0.07465,1/m,ok,
+570,0.0759,1/m,ok,
+571,0.0773,1/m,ok,
+572,0.0787,1/m,ok,
+573,0.0803,1/m,ok,
+574,0.0819,1/m,ok,
+575,0.08385,1/m,ok,
+576,0.0858,1/m,ok,
+577,0.0877,1/m,ok,
+578,0.0896,1/m,ok,
+579,0.0924,1/m,ok,
+580,0.0952,1/m,ok,
+581,0.0976,1/m,ok,
+582,0.1,1/m,ok,
+583,0.10395,1/m,ok,
+584,0.1079,1/m,ok,
+585,0.1119,1/m,ok,
+586,0.1159,1/m,ok,
+587,0.1206,1/m,ok,
+588,0.1253,1/m,ok,
+589,0.13045,1/m,ok,
+590,0.1356,1/m,ok,
+591,0.14075,1/m,ok,
+592,0.1459,1/m,ok,
+593,0.1513,1/m,ok,
+594,0.1567,1/m,ok,
+595,0.16335,1/m,ok,
+596,0.17,1/m,ok,
+597,0.178,1/m,ok,
+598,0.186,1/m,ok,
+599,0.2042,1/m,ok,
+600,0.2224,1/m,ok,
+601,0.2295,1/m,ok,
+602,0.2366,1/m,ok,
+603,0.2407,1/m,ok,
+604,0.2448,1/m,ok,
+605,0.25175,1/m,ok,
+606,0.2587,1/m,ok,
+607,0.262,1/m,ok,
+608,0.2653,1/m,ok,
+609,0.2672,1/m,ok,
+610,0.2691,1/m,ok,
+611,0.2703,1/m,ok,
+612,0.2715,1/m,ok,
+613,0.27275,1/m,ok,
+614,0.274,1/m,ok,
+615,0.2752,1/m,ok,
+616,0.2764,1/m,ok,
+617,0.27745,1/m,ok,
+618,0.2785,1/m,ok,
+619,0.27975,1/m,ok,
+620,0.281,1/m,ok,
+621,0.28245,1/m,ok,
+622,0.2839,1/m,ok,
+623,0.28535,1/m,ok,
+624,0.2868,1/m,ok,
+625,0.28805,1/m,ok,
+626,0.2893,1/m,ok,
+627,0.29075,1/m,ok,
+628,0.2922,1/m,ok,
+629,0.29385,1/m,ok,
+630,0.2955,1/m,ok,
+631,0.29715,1/m,ok,
+632,0.2988,1/m,ok,
+633,0.29995,1/m,ok,
+634,0.3011,1/m,ok,
+635,0.30245,1/m,ok,
+636,0.3038,1/m,ok,
+637,0.3057,1/m,ok,
+638,0.3076,1/m,ok,
+639,0.30935,1/m,ok,
+640,0.3111,1/m,ok,
+641,0.31275,1/m,ok,
+642,0.3144,1/m,ok,
+643,0.31625,1/m,ok,
+644,0.3181,1/m,ok,
+645,0.3202,1/m,ok,
+646,0.3223,1/m,ok,
+647,0.3243,1/m,ok,
+648,0.3263,1/m,ok,
+649,0.3289,1/m,ok,
+650,0.3315,1/m,ok,
+651,0.33385,1/m,ok,
+652,0.3362,1/m,ok,
+653,0.33925,1/m,ok,
+654,0.3423,1/m,ok,
+655,0.34655,1/m,ok,
+656,0.3508,1/m,ok,
+657,0.3572,1/m,ok,
+658,0.3636,1/m,ok,
+659,0.37135,1/m,ok,
+660,0.3791,1/m,ok,
+661,0.3861,1/m,ok,
+662,0.3931,1/m,ok,
+663,0.3975,1/m,ok,
+664,0.4019,1/m,ok,
+665,0.40455,1/m,ok,
+666,0.4072,1/m,ok,
+667,0.4085,1/m,ok,
+668,0.4098,1/m,ok,
+669,0.411,1/m,ok,
+670,0.4122,1/m,ok,
+671,0.4136,1/m,ok,
+672,0.415,1/m,ok,
+673,0.41615,1/m,ok,
+674,0.4173,1/m,ok,
+675,0.4198,1/m,ok,
+676,0.4223,1/m,ok,
+677,0.42465,1/m,ok,
+678,0.427,1/m,ok,
+679,0.4294,1/m,ok,
+680,0.4318,1/m,ok,
+681,0.43495,1/m,ok,
+682,0.4381,1/m,ok,
+683,0.44195,1/m,ok,
+684,0.4458,1/m,ok,
+685,0.45015,1/m,ok,
+686,0.4545,1/m,ok,
+687,0.45955,1/m,ok,
+688,0.4646,1/m,ok,
+689,0.4703,1/m,ok,
+690,0.476,1/m,ok,
+691,0.48315,1/m,ok,
+692,0.4903,1/m,ok,
+693,0.4987,1/m,ok,
+694,0.5071,1/m,ok,
+695,0.51575,1/m,ok,
+696,0.5244,1/m,ok,
+697,0.5357,1/m,ok,
+698,0.547,1/m,ok,
+699,0.5596,1/m,ok,
+700,0.5722,1/m,ok,
+701,0.58585,1/m,ok,
+702,0.5995,1/m,ok,
+703,0.6149,1/m,ok,
+704,0.6303,1/m,ok,
+705,0.64655,1/m,ok,
+706,0.6628,1/m,ok,
+707,0.68105,1/m,ok,
+708,0.6993,1/m,ok,
+709,0.7204,1/m,ok,
+710,0.7415,1/m,ok,
+711,0.7654,1/m,ok,
+712,0.7893,1/m,ok,
+713,0.8169,1/m,ok,
+714,0.8445,1/m,ok,
+715,0.8777,1/m,ok,
+716,0.9109,1/m,ok,
+717,0.949,1/m,ok,
+718,0.9871,1/m,ok,
+719,1.02975,1/m,ok,
+720,1.0724,1/m,ok,
+721,1.12015,1/m,ok,
+722,1.1679,1/m,ok,
+723,1.21815,1/m,ok,
+724,1.2684,1/m,ok,
+725,1.32015,1/m,ok,
+726,1.3719,1/m,ok,
+727,1.42945,1/m,ok,
+728,1.487,1/m,ok,
+729,1.55405,1/m,ok,
+730,1.6211,1/m,ok,
+731,1.70415,1/m,ok,
+732,1.7872,1/m,ok,
+733,1.88945,1/m,ok,
+734,1.9917,1/m,ok,
+735,2.09955,1/m,ok,
+736,2.2074,1/m,ok,
+737,2.3008,1/m,ok,
+738,2.3942,1/m,ok,
+739,2.46305,1/m,ok,
+740,2.5319,1/m,ok,
+741,2.5775,1/m,ok,
+742,2.6231,1/m,ok,
+743,2.6477,1/m,ok,
+744,2.6723,1/m,ok,
+745,2.6872,1/m,ok,
+746,2.7021,1/m,ok,
+747,2.71185,1/m,ok,
+748,2.7216,1/m,ok,
+749,2.7275,1/m,ok,
+750,2.7334,1/m,ok,
+751,2.73735,1/m,ok,
+752,2.7413,1/m,ok,
+753,2.74455,1/m,ok,
+754,2.7478,1/m,ok,
+755,2.751,1/m,ok,
+756,2.7542,1/m,ok,
+757,2.7585,1/m,ok,
+758,2.7628,1/m,ok,
+759,2.7669,1/m,ok,
+760,2.771,1/m,ok,
+761,2.77215,1/m,ok,
+762,2.7733,1/m,ok,
+763,2.77375,1/m,ok,
+764,2.7742,1/m,ok,
+765,2.77215,1/m,ok,
+766,2.7701,1/m,ok,
+767,2.76555,1/m,ok,
+768,2.761,1/m,ok,
+769,2.7576,1/m,ok,
+770,2.7542,1/m,ok,
+771,2.7512,1/m,ok,
+772,2.7482,1/m,ok,
+773,2.73935,1/m,ok,
+774,2.7305,1/m,ok,
+775,2.7201,1/m,ok,
+776,2.7097,1/m,ok,
+777,2.69965,1/m,ok,
+778,2.6896,1/m,ok,
+779,2.6743,1/m,ok,
+780,2.659,1/m,ok,
+781,2.6461,1/m,ok,
+782,2.6332,1/m,ok,
+783,2.6197,1/m,ok,
+784,2.6062,1/m,ok,
+785,2.5882,1/m,ok,
+786,2.5702,1/m,ok,
+787,2.55185,1/m,ok,
+788,2.5335,1/m,ok,
+789,2.51295,1/m,ok,
+790,2.4924,1/m,ok,
+791,2.47025,1/m,ok,
+792,2.4481,1/m,ok,
+793,2.4282,1/m,ok,
+794,2.4083,1/m,ok,
+795,2.39125,1/m,ok,
+796,2.3742,1/m,ok,
+797,2.3537,1/m,ok,
+798,2.3332,1/m,ok,
+799,2.3132,1/m,ok,
+800,2.2932,1/m,ok,