From a34fc9b0ab571db891c2cab5297a8625ed37914b Mon Sep 17 00:00:00 2001 From: SorooshMani-NOAA Date: Thu, 29 Aug 2024 08:32:32 -0400 Subject: [PATCH 01/10] Improve gahm parameter convergence --- ensembleperturbation/perturbation/atcf.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/ensembleperturbation/perturbation/atcf.py b/ensembleperturbation/perturbation/atcf.py index fd5fb61d..e57a477f 100644 --- a/ensembleperturbation/perturbation/atcf.py +++ b/ensembleperturbation/perturbation/atcf.py @@ -762,16 +762,16 @@ def find_parameter_from_GAHM_profile( if B is not None: # initial guesses when trying to find Bg, phi (and new B) Bg, phi = self.find_GAHM_parameters(B, Ro_inv) - rfo2 = 0.5 * isotach_rad * f - alpha = Rrat ** Bg + else: + # updates for when trying to find isotach_rad + isotach_rad = Rmax / Rrat + rfo2 = 0.5 * isotach_rad * f + alpha = Rrat ** Bg Vr_test = 1e6 * MaximumSustainedWindSpeed.unit tol = 1e-2 * MaximumSustainedWindSpeed.unit + i = 0 while any(abs(Vr_test - Vr) > tol): - if B is None: - # updates for when trying to find isotach_rad - isotach_rad = Rmax / Rrat - rfo2 = 0.5 * isotach_rad * f - alpha = Rrat ** Bg + i += 1 Vr_test = ( numpy.sqrt( Vmax ** 2 * (1 + Ro_inv) * numpy.exp(phi * (1 - alpha)) * alpha + rfo2 ** 2 @@ -779,9 +779,10 @@ def find_parameter_from_GAHM_profile( - rfo2 ) Vr_test[Vr_test < tol] = numpy.nan # no solution - # bi-section method - alpha[Rrat <= 1] *= 0.5 * (1 + (Vr / Vr_test)[Rrat <= 1] ** 2) - alpha[Rrat > 1] *= 0.5 * (1 + (Vr_test / Vr)[Rrat > 1] ** 2) + # bi-section method with correction rate + rate = 1 / 2**(i//1000 + 1) + alpha[Rrat <= 1] *= 1 + ((Vr / Vr_test)[Rrat <= 1] ** 2 - 1) * rate + alpha[Rrat > 1] *= 1 + ((Vr_test / Vr)[Rrat > 1] ** 2 - 1) * rate if B is not None: # update to and Bg, phi Bg = numpy.log(alpha) / numpy.log(Rrat) @@ -790,6 +791,8 @@ def find_parameter_from_GAHM_profile( else: # update to Rrat Rrat = numpy.exp(numpy.log(alpha) / Bg) + isotach_rad = Rmax / Rrat + rfo2 = 0.5 * isotach_rad * f if B is not None: return Bg * phi / ((1 + Ro_inv) * numpy.exp(phi - 1)) # B else: From c2fac1574a3f8bd8566da446b8a47478c1f66d0d Mon Sep 17 00:00:00 2001 From: SorooshMani-NOAA Date: Thu, 29 Aug 2024 08:35:49 -0400 Subject: [PATCH 02/10] Styling --- ensembleperturbation/perturbation/atcf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ensembleperturbation/perturbation/atcf.py b/ensembleperturbation/perturbation/atcf.py index e57a477f..3b900979 100644 --- a/ensembleperturbation/perturbation/atcf.py +++ b/ensembleperturbation/perturbation/atcf.py @@ -780,7 +780,7 @@ def find_parameter_from_GAHM_profile( ) Vr_test[Vr_test < tol] = numpy.nan # no solution # bi-section method with correction rate - rate = 1 / 2**(i//1000 + 1) + rate = 1 / 2 ** (i // 1000 + 1) alpha[Rrat <= 1] *= 1 + ((Vr / Vr_test)[Rrat <= 1] ** 2 - 1) * rate alpha[Rrat > 1] *= 1 + ((Vr_test / Vr)[Rrat > 1] ** 2 - 1) * rate if B is not None: From 20de300c69f89328bd3016adb6de5ad5ec1e5b89 Mon Sep 17 00:00:00 2001 From: William Pringle Date: Tue, 3 Sep 2024 09:09:57 -0500 Subject: [PATCH 03/10] cleaning up GAHM Vr function by adding new variables, reducing number of iterations needed and adding RunTimeError when iterations exceed 1000 --- ensembleperturbation/perturbation/atcf.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ensembleperturbation/perturbation/atcf.py b/ensembleperturbation/perturbation/atcf.py index 3b900979..a664c9e0 100644 --- a/ensembleperturbation/perturbation/atcf.py +++ b/ensembleperturbation/perturbation/atcf.py @@ -767,20 +767,17 @@ def find_parameter_from_GAHM_profile( isotach_rad = Rmax / Rrat rfo2 = 0.5 * isotach_rad * f alpha = Rrat ** Bg + beta = Vmax ** 2 * (1 + Ro_inv) Vr_test = 1e6 * MaximumSustainedWindSpeed.unit tol = 1e-2 * MaximumSustainedWindSpeed.unit i = 0 + itmax = 1000 while any(abs(Vr_test - Vr) > tol): - i += 1 - Vr_test = ( - numpy.sqrt( - Vmax ** 2 * (1 + Ro_inv) * numpy.exp(phi * (1 - alpha)) * alpha + rfo2 ** 2 - ) - - rfo2 - ) + expf = numpy.exp(phi * (1 - alpha)) + Vr_test = numpy.sqrt(beta * expf * alpha + rfo2 ** 2) - rfo2 Vr_test[Vr_test < tol] = numpy.nan # no solution # bi-section method with correction rate - rate = 1 / 2 ** (i // 1000 + 1) + rate = 1 / 2 ** (i // 50 + 1) alpha[Rrat <= 1] *= 1 + ((Vr / Vr_test)[Rrat <= 1] ** 2 - 1) * rate alpha[Rrat > 1] *= 1 + ((Vr_test / Vr)[Rrat > 1] ** 2 - 1) * rate if B is not None: @@ -790,9 +787,12 @@ def find_parameter_from_GAHM_profile( phi[phi < 1] = 1 else: # update to Rrat - Rrat = numpy.exp(numpy.log(alpha) / Bg) + Rrat = alpha ** (1 / Bg) isotach_rad = Rmax / Rrat rfo2 = 0.5 * isotach_rad * f + i += 1 + if i == itmax: + raise RuntimeError('GAHM function could not converge') if B is not None: return Bg * phi / ((1 + Ro_inv) * numpy.exp(phi - 1)) # B else: From 1e389812f60dc6df7954f1876249b3fb678e4797 Mon Sep 17 00:00:00 2001 From: SorooshMani-NOAA Date: Wed, 4 Sep 2024 15:42:08 -0400 Subject: [PATCH 04/10] Add convergance test and new testing package dependencies --- pyproject.toml | 3 ++- tests/test_perturb.py | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 tests/test_perturb.py diff --git a/pyproject.toml b/pyproject.toml index 7c0c7ad7..eaeca9f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,6 +52,7 @@ oitnb = { version = '*', optional = true } pytest = { version = '*', optional = true } pytest-cov = { version = '*', optional = true } pytest-xdist = { version = '*', optional = true } +pytest-timeout = { version = '*', optional = true } wget = { version = '*', optional = true } m2r2 = { version = '*', optional = true } sphinx = { version = '*', optional = true } @@ -61,7 +62,7 @@ sphinxcontrib-programoutput = { version = '*', optional = true } [tool.poetry.extras] plotting = ['cartopy', 'cmocean', 'matplotlib'] -testing = ['pytest', 'pytest-cov', 'pytest-socket', 'pytest-xdist', 'wget'] +testing = ['pytest', 'pytest-cov', 'pytest-socket', 'pytest-xdist', 'pytest-timeout', 'wget'] development = ['isort', 'oitnb'] documentation = ['dunamai', 'm2r2', 'sphinx', 'sphinx-rtd-theme', 'sphinxcontrib-programoutput', 'sphinxcontrib-bibtex', 'cartopy', 'cmocean', 'matplotlib'] adcirc = ['adcircpy'] diff --git a/tests/test_perturb.py b/tests/test_perturb.py new file mode 100644 index 00000000..d0bfbc86 --- /dev/null +++ b/tests/test_perturb.py @@ -0,0 +1,53 @@ +import pdb +import tempfile +from datetime import datetime +from pathlib import Path + +import pytest + +from stormevents.nhc.const import RMWFillMethod +from stormevents.nhc.track import VortexTrack +from ensembleperturbation.perturbation.atcf import ( + MaximumSustainedWindSpeed, + perturb_tracks, +) + + +@pytest.mark.timeout(60) +@pytest.mark.parametrize( + "storm,year,date1,date2", + [ + ('irma', 2017, datetime(2017,9,10,0), datetime(2017,9,13,12)), + ('florence', 2018, datetime(2018,9,12,18), datetime(2018,9,19,0)), + ('laura', 2020, datetime(2020,8,25,6), datetime(2020,8,31,6)), + ] +) +def test_perturb_performance(storm, year, date1, date2): + + with tempfile.TemporaryDirectory() as tdir: + track_path = Path(tdir) / 'track.dat' + pert_path = Path(tdir) / 'track_perturb_dir' + + if not track_path.exists(): + track = VortexTrack.from_storm_name( + storm, + year, + file_deck='a', + advisories=['OFCL'], + rmw_fill=RMWFillMethod.regression_penny_2023 + ) + track.to_file(track_path) + + perturb_tracks( + 39, + variables=[MaximumSustainedWindSpeed], + directory=pert_path, + storm=track_path, + sample_from_distribution=True, + sample_rule='korobov', + file_deck='a', + advisories=['OFCL'], + start_date=date1, + end_date=date2, + parallel=True, + ) From 316f45814dc1d074ec3cb885e98968ca4fccdce3 Mon Sep 17 00:00:00 2001 From: SorooshMani-NOAA Date: Thu, 5 Sep 2024 09:52:33 -0400 Subject: [PATCH 05/10] Style fix --- tests/test_perturb.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_perturb.py b/tests/test_perturb.py index d0bfbc86..1344e317 100644 --- a/tests/test_perturb.py +++ b/tests/test_perturb.py @@ -15,12 +15,12 @@ @pytest.mark.timeout(60) @pytest.mark.parametrize( - "storm,year,date1,date2", + 'storm,year,date1,date2', [ - ('irma', 2017, datetime(2017,9,10,0), datetime(2017,9,13,12)), - ('florence', 2018, datetime(2018,9,12,18), datetime(2018,9,19,0)), - ('laura', 2020, datetime(2020,8,25,6), datetime(2020,8,31,6)), - ] + ('irma', 2017, datetime(2017, 9, 10, 0), datetime(2017, 9, 13, 12)), + ('florence', 2018, datetime(2018, 9, 12, 18), datetime(2018, 9, 19, 0)), + ('laura', 2020, datetime(2020, 8, 25, 6), datetime(2020, 8, 31, 6)), + ], ) def test_perturb_performance(storm, year, date1, date2): @@ -34,7 +34,7 @@ def test_perturb_performance(storm, year, date1, date2): year, file_deck='a', advisories=['OFCL'], - rmw_fill=RMWFillMethod.regression_penny_2023 + rmw_fill=RMWFillMethod.regression_penny_2023, ) track.to_file(track_path) From d9d07aa17bcac2284634827526d4fd63992d38ac Mon Sep 17 00:00:00 2001 From: SorooshMani-NOAA Date: Thu, 5 Sep 2024 12:45:47 -0400 Subject: [PATCH 06/10] Fix timeout multiprocess termination --- tests/test_perturb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_perturb.py b/tests/test_perturb.py index 1344e317..f83311e7 100644 --- a/tests/test_perturb.py +++ b/tests/test_perturb.py @@ -49,5 +49,5 @@ def test_perturb_performance(storm, year, date1, date2): advisories=['OFCL'], start_date=date1, end_date=date2, - parallel=True, + parallel=False, # Parallel interfere's with timeout ) From c7262ac7dc255036694c25aa96d2d3144182bfc7 Mon Sep 17 00:00:00 2001 From: William Pringle Date: Thu, 5 Sep 2024 13:35:12 -0500 Subject: [PATCH 07/10] implementation of true bisection method to improve GAHM convergence. previously I saw over 50 iterations at times, now I see mostly 15 iterations needed and up to no more than 30 with the tests performed --- ensembleperturbation/perturbation/atcf.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ensembleperturbation/perturbation/atcf.py b/ensembleperturbation/perturbation/atcf.py index a664c9e0..b958c349 100644 --- a/ensembleperturbation/perturbation/atcf.py +++ b/ensembleperturbation/perturbation/atcf.py @@ -767,6 +767,8 @@ def find_parameter_from_GAHM_profile( isotach_rad = Rmax / Rrat rfo2 = 0.5 * isotach_rad * f alpha = Rrat ** Bg + alpha_lo = numpy.nan * alpha + alpha_hi = numpy.nan * alpha beta = Vmax ** 2 * (1 + Ro_inv) Vr_test = 1e6 * MaximumSustainedWindSpeed.unit tol = 1e-2 * MaximumSustainedWindSpeed.unit @@ -776,12 +778,17 @@ def find_parameter_from_GAHM_profile( expf = numpy.exp(phi * (1 - alpha)) Vr_test = numpy.sqrt(beta * expf * alpha + rfo2 ** 2) - rfo2 Vr_test[Vr_test < tol] = numpy.nan # no solution - # bi-section method with correction rate - rate = 1 / 2 ** (i // 50 + 1) - alpha[Rrat <= 1] *= 1 + ((Vr / Vr_test)[Rrat <= 1] ** 2 - 1) * rate - alpha[Rrat > 1] *= 1 + ((Vr_test / Vr)[Rrat > 1] ** 2 - 1) * rate + # updates for bi-section method + alpha_hi[Vr_test > Vr] = alpha[Vr_test > Vr] + alpha_lo[Vr_test < Vr] = alpha[Vr_test < Vr] + # guess new alpha based on error + alpha[Rrat <= 1] *= (Vr / Vr_test)[Rrat <= 1] ** 2 + alpha[Rrat > 1] *= (Vr_test / Vr)[Rrat > 1] ** 2 + # bi-section method to help convergence + avail = ~numpy.isnan(alpha_hi) & ~numpy.isnan(alpha_lo) + alpha[avail] = 0.5 * (alpha_hi[avail] + alpha_lo[avail]) if B is not None: - # update to and Bg, phi + # update to Bg, phi Bg = numpy.log(alpha) / numpy.log(Rrat) phi = 1 + Ro_inv / (Bg * (1 + Ro_inv)) phi[phi < 1] = 1 From ed25fd10523b337328931316d833daac901d59de Mon Sep 17 00:00:00 2001 From: William Pringle Date: Fri, 6 Sep 2024 13:23:13 -0500 Subject: [PATCH 08/10] reording so that the output parameters are not changed after Vr_test is converged. setting alpha_hi to always be 1 at the beginning --- ensembleperturbation/perturbation/atcf.py | 28 ++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/ensembleperturbation/perturbation/atcf.py b/ensembleperturbation/perturbation/atcf.py index b958c349..f46c9347 100644 --- a/ensembleperturbation/perturbation/atcf.py +++ b/ensembleperturbation/perturbation/atcf.py @@ -768,25 +768,15 @@ def find_parameter_from_GAHM_profile( rfo2 = 0.5 * isotach_rad * f alpha = Rrat ** Bg alpha_lo = numpy.nan * alpha - alpha_hi = numpy.nan * alpha + alpha_hi = 0 * alpha + 1 beta = Vmax ** 2 * (1 + Ro_inv) + beta[Vmax < Vr] = numpy.nan # no possible solution Vr_test = 1e6 * MaximumSustainedWindSpeed.unit tol = 1e-2 * MaximumSustainedWindSpeed.unit i = 0 itmax = 1000 while any(abs(Vr_test - Vr) > tol): - expf = numpy.exp(phi * (1 - alpha)) - Vr_test = numpy.sqrt(beta * expf * alpha + rfo2 ** 2) - rfo2 - Vr_test[Vr_test < tol] = numpy.nan # no solution - # updates for bi-section method - alpha_hi[Vr_test > Vr] = alpha[Vr_test > Vr] - alpha_lo[Vr_test < Vr] = alpha[Vr_test < Vr] - # guess new alpha based on error - alpha[Rrat <= 1] *= (Vr / Vr_test)[Rrat <= 1] ** 2 - alpha[Rrat > 1] *= (Vr_test / Vr)[Rrat > 1] ** 2 - # bi-section method to help convergence - avail = ~numpy.isnan(alpha_hi) & ~numpy.isnan(alpha_lo) - alpha[avail] = 0.5 * (alpha_hi[avail] + alpha_lo[avail]) + # updates to desired parameters with current alpha value if B is not None: # update to Bg, phi Bg = numpy.log(alpha) / numpy.log(Rrat) @@ -797,6 +787,18 @@ def find_parameter_from_GAHM_profile( Rrat = alpha ** (1 / Bg) isotach_rad = Rmax / Rrat rfo2 = 0.5 * isotach_rad * f + # compute Vr using the current set of inputs + expf = numpy.exp(phi * (1 - alpha)) + Vr_test = numpy.sqrt(beta * expf * alpha + rfo2 ** 2) - rfo2 + # updates to the alphas for bi-section method + alpha_hi[Vr_test > Vr] = alpha[Vr_test > Vr] + alpha_lo[Vr_test < Vr] = alpha[Vr_test < Vr] + # guess new alpha based on error + alpha[Rrat <= 1] *= (Vr / Vr_test)[Rrat <= 1] ** 2 + alpha[Rrat > 1] *= (Vr_test / Vr)[Rrat > 1] ** 2 + # bi-section method to help convergence + avail = ~numpy.isnan(alpha_lo) + alpha[avail] = 0.5 * (alpha_hi[avail] + alpha_lo[avail]) i += 1 if i == itmax: raise RuntimeError('GAHM function could not converge') From 2216379020409af1d90d9bbadc9b79769eb47aaf Mon Sep 17 00:00:00 2001 From: William Pringle Date: Fri, 6 Sep 2024 13:25:22 -0500 Subject: [PATCH 09/10] updating advisory test files with the convergence changes --- .../vortex_4_variable_korobov_3.22 | 4 ++-- .../vortex_4_variable_korobov_6.22 | 2 +- .../vortex_4_variable_korobov_8.22 | 6 +++--- .../vortex_4_variable_korobov_9.22 | 4 ++-- .../vortex_4_variable_korobov_1.22 | 3 ++- .../vortex_4_variable_korobov_2.22 | 1 + .../vortex_4_variable_korobov_3.22 | 4 ++-- .../vortex_4_variable_korobov_4.22 | 8 ++++---- .../vortex_4_variable_korobov_6.22 | 4 ++-- .../vortex_4_variable_korobov_7.22 | 12 ++++++------ .../vortex_4_variable_korobov_8.22 | 2 +- .../vortex_4_variable_korobov_9.22 | 2 +- 12 files changed, 27 insertions(+), 25 deletions(-) diff --git a/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_3.22 b/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_3.22 index 8e514918..5b86965b 100644 --- a/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_3.22 +++ b/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_3.22 @@ -1,12 +1,12 @@ AL, 06, 2018091218, , OFCL, 0, 305N, 719W, 108, 945, HU, 34, NEQ, 160, 132, 94, 132, 1013, 0, 14,,, ,, , 315, 8, , 1 -AL, 06, 2018091218, , OFCL, 0, 305N, 719W, 108, 945, HU, 50, NEQ, 93, 74, 56, 74, 1013, 0, 14,,, ,, , 315, 8, , 1 +AL, 06, 2018091218, , OFCL, 0, 305N, 719W, 108, 945, HU, 50, NEQ, 93, 75, 56, 75, 1013, 0, 14,,, ,, , 315, 8, , 1 AL, 06, 2018091218, , OFCL, 0, 305N, 719W, 108, 945, HU, 64, NEQ, 55, 55, 37, 55, 1013, 0, 14,,, ,, , 315, 8, , 1 AL, 06, 2018091218, , OFCL, 3, 310N, 726W, 102, 953, HU, 34, NEQ, 155, 126, 87, 123, 1013, 0, 14,,, ,, , 315, 8, , 2 AL, 06, 2018091218, , OFCL, 3, 310N, 726W, 102, 953, HU, 50, NEQ, 89, 70, 51, 69, 1013, 0, 14,,, ,, , 315, 8, , 2 AL, 06, 2018091218, , OFCL, 3, 310N, 726W, 102, 953, HU, 64, NEQ, 52, 52, 33, 50, 1013, 0, 14,,, ,, , 315, 8, , 2 AL, 06, 2018091218, , OFCL, 12, 323N, 742W, 105, 951, HU, 34, NEQ, 137, 110, 75, 108, 1013, 0, 12,,, ,, , 313, 7, , 3 AL, 06, 2018091218, , OFCL, 12, 323N, 742W, 105, 951, HU, 50, NEQ, 77, 60, 44, 59, 1013, 0, 12,,, ,, , 313, 7, , 3 -AL, 06, 2018091218, , OFCL, 12, 323N, 742W, 105, 951, HU, 64, NEQ, 44, 44, 29, 43, 1013, 0, 12,,, ,, , 313, 7, , 3 +AL, 06, 2018091218, , OFCL, 12, 323N, 742W, 105, 951, HU, 64, NEQ, 44, 44, 28, 43, 1013, 0, 12,,, ,, , 313, 7, , 3 AL, 06, 2018091218, , OFCL, 24, 337N, 762W, 102, 954, HU, 34, NEQ, 114, 91, 61, 89, 1013, 0, 9,,, ,, , 310, 6, , 4 AL, 06, 2018091218, , OFCL, 24, 337N, 762W, 102, 954, HU, 50, NEQ, 62, 48, 34, 47, 1013, 0, 9,,, ,, , 310, 6, , 4 AL, 06, 2018091218, , OFCL, 24, 337N, 762W, 102, 954, HU, 64, NEQ, 34, 34, 22, 33, 1013, 0, 9,,, ,, , 310, 6, , 4 diff --git a/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_6.22 b/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_6.22 index bfebd334..2c1e0e45 100644 --- a/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_6.22 +++ b/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_6.22 @@ -17,6 +17,6 @@ AL, 06, 2018091218, , OFCL, 48, 336N, 785W, 104, 951, HU, 34, NEQ, 169, AL, 06, 2018091218, , OFCL, 48, 336N, 785W, 104, 951, HU, 50, NEQ, 99, 78, 57, 57, 1013, 0, 13,,, ,, , 254, 2, , 6 AL, 06, 2018091218, , OFCL, 48, 336N, 785W, 104, 951, HU, 64, NEQ, 59, 59, 38, 38, 1013, 0, 13,,, ,, , 254, 2, , 6 AL, 06, 2018091218, , OFCL, 72, 335N, 802W, 74, 982, HU, 34, NEQ, 172, 138, 64, 64, 1013, 0, 12,,, ,, , 266, 2, , 7 -AL, 06, 2018091218, , OFCL, 72, 335N, 802W, 74, 982, HU, 50, NEQ, 82, 81, 37, 37, 1013, 0, 12,,, ,, , 266, 2, , 7 +AL, 06, 2018091218, , OFCL, 72, 335N, 802W, 74, 982, HU, 50, NEQ, 82, 82, 37, 37, 1013, 0, 12,,, ,, , 266, 2, , 7 AL, 06, 2018091218, , OFCL, 96, 346N, 829W, 34, 1007, TD, 34, NEQ, 0, 0, 0, 0, 1013, 0, 10,,, ,, , 296, 3, , 8 AL, 06, 2018091218, , OFCL, 120, 364N, 850W, 24, 1010, LO, 34, NEQ, 0, 0, 0, 0, 1013, 0, 13,,, ,, , 316, 3, , 9 diff --git a/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_8.22 b/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_8.22 index a8b0a66d..c899e155 100644 --- a/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_8.22 +++ b/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_8.22 @@ -10,13 +10,13 @@ AL, 06, 2018091218, , OFCL, 12, 320N, 742W, 118, 931, HU, 64, NEQ, 86, AL, 06, 2018091218, , OFCL, 24, 332N, 760W, 122, 925, HU, 34, NEQ, 239, 200, 147, 203, 1013, 0, 21,,, ,, , 309, 5, , 4 AL, 06, 2018091218, , OFCL, 24, 332N, 760W, 122, 925, HU, 50, NEQ, 150, 121, 93, 123, 1013, 0, 21,,, ,, , 309, 5, , 4 AL, 06, 2018091218, , OFCL, 24, 332N, 760W, 122, 925, HU, 64, NEQ, 94, 95, 64, 97, 1013, 0, 21,,, ,, , 309, 5, , 4 -AL, 06, 2018091218, , OFCL, 36, 336N, 771W, 119, 930, HU, 34, NEQ, 269, 226, 168, 229, 1013, 0, 25,,, ,, , 293, 3, , 5 +AL, 06, 2018091218, , OFCL, 36, 336N, 771W, 119, 930, HU, 34, NEQ, 269, 227, 168, 229, 1013, 0, 25,,, ,, , 293, 3, , 5 AL, 06, 2018091218, , OFCL, 36, 336N, 771W, 119, 930, HU, 50, NEQ, 172, 140, 108, 142, 1013, 0, 25,,, ,, , 293, 3, , 5 AL, 06, 2018091218, , OFCL, 36, 336N, 771W, 119, 930, HU, 64, NEQ, 111, 112, 76, 114, 1013, 0, 25,,, ,, , 293, 3, , 5 AL, 06, 2018091218, , OFCL, 48, 336N, 776W, 113, 937, HU, 34, NEQ, 282, 238, 179, 210, 1013, 0, 27,,, ,, , 273, 1, , 6 AL, 06, 2018091218, , OFCL, 48, 336N, 776W, 113, 937, HU, 50, NEQ, 182, 149, 116, 115, 1013, 0, 27,,, ,, , 273, 1, , 6 -AL, 06, 2018091218, , OFCL, 48, 336N, 776W, 113, 937, HU, 64, NEQ, 119, 120, 82, 81, 1013, 0, 27,,, ,, , 273, 1, , 6 +AL, 06, 2018091218, , OFCL, 48, 336N, 776W, 113, 937, HU, 64, NEQ, 119, 121, 82, 81, 1013, 0, 27,,, ,, , 273, 1, , 6 AL, 06, 2018091218, , OFCL, 72, 330N, 789W, 84, 972, HU, 34, NEQ, 299, 249, 129, 128, 1013, 0, 24,,, ,, , 243, 2, , 7 -AL, 06, 2018091218, , OFCL, 72, 330N, 789W, 84, 972, HU, 50, NEQ, 169, 170, 84, 83, 1013, 0, 24,,, ,, , 243, 2, , 7 +AL, 06, 2018091218, , OFCL, 72, 330N, 789W, 84, 972, HU, 50, NEQ, 169, 171, 84, 83, 1013, 0, 24,,, ,, , 243, 2, , 7 AL, 06, 2018091218, , OFCL, 96, 330N, 819W, 44, 1002, TD, 34, NEQ, 48, 44, 35, 39, 1013, 0, 26,,, ,, , 271, 3, , 8 AL, 06, 2018091218, , OFCL, 120, 344N, 843W, 34, 1006, LO, 34, NEQ, 0, 0, 0, 0, 1013, 0, 29,,, ,, , 305, 3, , 9 diff --git a/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_9.22 b/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_9.22 index a1b4a1b6..913e6080 100644 --- a/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_9.22 +++ b/tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_9.22 @@ -1,4 +1,4 @@ -AL, 06, 2018091218, , OFCL, 0, 304N, 720W, 114, 937, HU, 34, NEQ, 186, 154, 110, 154, 1013, 0, 16,,, ,, , 311, 8, , 1 +AL, 06, 2018091218, , OFCL, 0, 304N, 720W, 114, 937, HU, 34, NEQ, 186, 153, 110, 153, 1013, 0, 16,,, ,, , 311, 8, , 1 AL, 06, 2018091218, , OFCL, 0, 304N, 720W, 114, 937, HU, 50, NEQ, 111, 89, 66, 89, 1013, 0, 16,,, ,, , 311, 8, , 1 AL, 06, 2018091218, , OFCL, 0, 304N, 720W, 114, 937, HU, 64, NEQ, 67, 67, 44, 67, 1013, 0, 16,,, ,, , 311, 8, , 1 AL, 06, 2018091218, , OFCL, 3, 309N, 726W, 112, 940, HU, 34, NEQ, 191, 157, 113, 158, 1013, 0, 16,,, ,, , 311, 8, , 2 @@ -17,6 +17,6 @@ AL, 06, 2018091218, , OFCL, 48, 331N, 782W, 120, 928, HU, 34, NEQ, 236, AL, 06, 2018091218, , OFCL, 48, 331N, 782W, 120, 928, HU, 50, NEQ, 147, 116, 86, 86, 1013, 0, 17,,, ,, , 242, 1, , 6 AL, 06, 2018091218, , OFCL, 48, 331N, 782W, 120, 928, HU, 64, NEQ, 92, 93, 59, 58, 1013, 0, 17,,, ,, , 242, 1, , 6 AL, 06, 2018091218, , OFCL, 72, 325N, 797W, 92, 965, HU, 34, NEQ, 281, 227, 104, 103, 1013, 0, 15,,, ,, , 247, 2, , 7 -AL, 06, 2018091218, , OFCL, 72, 325N, 797W, 92, 965, HU, 50, NEQ, 156, 158, 66, 65, 1013, 0, 15,,, ,, , 247, 2, , 7 +AL, 06, 2018091218, , OFCL, 72, 325N, 797W, 92, 965, HU, 50, NEQ, 155, 158, 66, 65, 1013, 0, 15,,, ,, , 247, 2, , 7 AL, 06, 2018091218, , OFCL, 96, 330N, 834W, 52, 998, TD, 34, NEQ, 37, 34, 27, 29, 1013, 0, 14,,, ,, , 280, 4, , 8 AL, 06, 2018091218, , OFCL, 120, 347N, 862W, 42, 1003, LO, 34, NEQ, 31, 27, 0, 22, 1013, 0, 17,,, ,, , 306, 4, , 9 diff --git a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_1.22 b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_1.22 index a799e906..4be85434 100644 --- a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_1.22 +++ b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_1.22 @@ -1,10 +1,11 @@ AL, 09, 2021082800, 03, OFCL, 0, 225N, 834W, 66, 988, HU, 34, NEQ, 100, 62, 42, 70, 1010, 0, 22, 85, 0, , 0, JPC, 322, 7, , 1 AL, 09, 2021082800, 03, OFCL, 0, 225N, 834W, 66, 988, HU, 50, NEQ, 50, 32, 32, 31, 1010, 0, 22, 85, 0, , 0, JPC, 322, 7, , 1 +AL, 09, 2021082800, 03, OFCL, 0, 225N, 834W, 66, 988, HU, 64, NEQ, 22, 0, 0, 0, 1010, 0, 22, 85, 0, , 0, JPC, 322, 7, , 1 AL, 09, 2021082800, 03, OFCL, 3, 230N, 839W, 65, 992, HU, 34, NEQ, 98, 61, 41, 68, 1010, 0, 21, 85, 0, , 0, JPC, 322, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 230N, 839W, 65, 992, HU, 50, NEQ, 49, 31, 0, 28, 1010, 0, 21, 85, 0, , 0, JPC, 322, 7, , 2 AL, 09, 2021082800, 03, OFCL, 12, 245N, 853W, 76, 981, HU, 34, NEQ, 111, 83, 62, 89, 1010, 0, 21, 105, 0, , 0, JPC, 319, 7, , 3 AL, 09, 2021082800, 03, OFCL, 12, 245N, 853W, 76, 981, HU, 50, NEQ, 52, 43, 19, 41, 1010, 0, 21, 105, 0, , 0, JPC, 319, 7, , 3 -AL, 09, 2021082800, 03, OFCL, 12, 245N, 853W, 76, 981, HU, 64, NEQ, 19, 0, 0, 0, 1010, 0, 21, 105, 0, , 0, JPC, 319, 7, , 3 +AL, 09, 2021082800, 03, OFCL, 12, 245N, 853W, 76, 981, HU, 64, NEQ, 19, 20, 0, 0, 1010, 0, 21, 105, 0, , 0, JPC, 319, 7, , 3 AL, 09, 2021082800, 03, OFCL, 24, 263N, 872W, 91, 968, HU, 34, NEQ, 130, 111, 79, 108, 1010, 0, 19, 130, 0, , 0, JPC, 316, 6, , 4 AL, 09, 2021082800, 03, OFCL, 24, 263N, 872W, 91, 968, HU, 50, NEQ, 69, 58, 37, 47, 1010, 0, 19, 130, 0, , 0, JPC, 316, 6, , 4 AL, 09, 2021082800, 03, OFCL, 24, 263N, 872W, 91, 968, HU, 64, NEQ, 27, 27, 18, 26, 1010, 0, 19, 130, 0, , 0, JPC, 316, 6, , 4 diff --git a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_2.22 b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_2.22 index ccae5cc3..c10a4d00 100644 --- a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_2.22 +++ b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_2.22 @@ -1,5 +1,6 @@ AL, 09, 2021082800, 03, OFCL, 0, 225N, 835W, 68, 987, HU, 34, NEQ, 91, 55, 37, 63, 1010, 0, 19, 85, 0, , 0, JPC, 320, 7, , 1 AL, 09, 2021082800, 03, OFCL, 0, 225N, 835W, 68, 987, HU, 50, NEQ, 45, 28, 28, 27, 1010, 0, 19, 85, 0, , 0, JPC, 320, 7, , 1 +AL, 09, 2021082800, 03, OFCL, 0, 225N, 835W, 68, 987, HU, 64, NEQ, 19, 0, 0, 0, 1010, 0, 19, 85, 0, , 0, JPC, 320, 7, , 1 AL, 09, 2021082800, 03, OFCL, 3, 231N, 840W, 67, 991, HU, 34, NEQ, 87, 52, 34, 59, 1010, 0, 17, 85, 0, , 0, JPC, 320, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 231N, 840W, 67, 991, HU, 50, NEQ, 42, 26, 19, 24, 1010, 0, 17, 85, 0, , 0, JPC, 320, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 231N, 840W, 67, 991, HU, 64, NEQ, 18, 0, 0, 0, 1010, 0, 17, 85, 0, , 0, JPC, 320, 7, , 2 diff --git a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_3.22 b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_3.22 index 2177eb44..e4543e36 100644 --- a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_3.22 +++ b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_3.22 @@ -1,6 +1,6 @@ AL, 09, 2021082800, 03, OFCL, 0, 226N, 835W, 69, 986, HU, 34, NEQ, 76, 44, 29, 52, 1010, 0, 15, 85, 0, , 0, JPC, 319, 8, , 1 AL, 09, 2021082800, 03, OFCL, 0, 226N, 835W, 69, 986, HU, 50, NEQ, 36, 22, 23, 21, 1010, 0, 15, 85, 0, , 0, JPC, 319, 8, , 1 -AL, 09, 2021082800, 03, OFCL, 0, 226N, 835W, 69, 986, HU, 64, NEQ, 0, 16, 0, 0, 1010, 0, 15, 85, 0, , 0, JPC, 319, 8, , 1 +AL, 09, 2021082800, 03, OFCL, 0, 226N, 835W, 69, 986, HU, 64, NEQ, 15, 16, 0, 0, 1010, 0, 15, 85, 0, , 0, JPC, 319, 8, , 1 AL, 09, 2021082800, 03, OFCL, 3, 232N, 841W, 68, 991, HU, 34, NEQ, 68, 38, 24, 43, 1010, 0, 11, 85, 0, , 0, JPC, 319, 8, , 2 AL, 09, 2021082800, 03, OFCL, 3, 232N, 841W, 68, 991, HU, 50, NEQ, 31, 18, 13, 17, 1010, 0, 11, 85, 0, , 0, JPC, 319, 8, , 2 AL, 09, 2021082800, 03, OFCL, 3, 232N, 841W, 68, 991, HU, 64, NEQ, 12, 0, 0, 0, 1010, 0, 11, 85, 0, , 0, JPC, 319, 8, , 2 @@ -9,7 +9,7 @@ AL, 09, 2021082800, 03, OFCL, 12, 247N, 858W, 81, 977, HU, 50, NEQ, 18, AL, 09, 2021082800, 03, OFCL, 12, 247N, 858W, 81, 977, HU, 64, NEQ, 7, 6, 0, 7, 1010, 0, 6, 105, 0, , 0, JPC, 316, 8, , 3 AL, 09, 2021082800, 03, OFCL, 24, 266N, 880W, 99, 961, HU, 34, NEQ, 54, 43, 27, 42, 1010, 0, 5, 130, 0, , 0, JPC, 314, 7, , 4 AL, 09, 2021082800, 03, OFCL, 24, 266N, 880W, 99, 961, HU, 50, NEQ, 23, 19, 11, 15, 1010, 0, 5, 130, 0, , 0, JPC, 314, 7, , 4 -AL, 09, 2021082800, 03, OFCL, 24, 266N, 880W, 99, 961, HU, 64, NEQ, 7, 7, 5, 7, 1010, 0, 5, 130, 0, , 0, JPC, 314, 7, , 4 +AL, 09, 2021082800, 03, OFCL, 24, 266N, 880W, 99, 961, HU, 64, NEQ, 7, 7, 6, 7, 1010, 0, 5, 130, 0, , 0, JPC, 314, 7, , 4 AL, 09, 2021082800, 03, OFCL, 36, 286N, 899W, 113, 946, HU, 34, NEQ, 63, 51, 34, 50, 1010, 0, 5, 145, 0, , 0, JPC, 319, 7, , 5 AL, 09, 2021082800, 03, OFCL, 36, 286N, 899W, 113, 946, HU, 50, NEQ, 25, 25, 12, 20, 1010, 0, 5, 145, 0, , 0, JPC, 319, 7, , 5 AL, 09, 2021082800, 03, OFCL, 36, 286N, 899W, 113, 946, HU, 64, NEQ, 14, 12, 8, 12, 1010, 0, 5, 145, 0, , 0, JPC, 319, 7, , 5 diff --git a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_4.22 b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_4.22 index 2b645923..d72a9f6a 100644 --- a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_4.22 +++ b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_4.22 @@ -1,15 +1,15 @@ AL, 09, 2021082800, 03, OFCL, 0, 225N, 834W, 69, 986, HU, 34, NEQ, 111, 68, 46, 79, 1010, 0, 24, 85, 0, , 0, JPC, 318, 7, , 1 AL, 09, 2021082800, 03, OFCL, 0, 225N, 834W, 69, 986, HU, 50, NEQ, 57, 35, 37, 35, 1010, 0, 24, 85, 0, , 0, JPC, 318, 7, , 1 -AL, 09, 2021082800, 03, OFCL, 0, 225N, 834W, 69, 986, HU, 64, NEQ, 0, 27, 0, 0, 1010, 0, 24, 85, 0, , 0, JPC, 318, 7, , 1 +AL, 09, 2021082800, 03, OFCL, 0, 225N, 834W, 69, 986, HU, 64, NEQ, 24, 27, 0, 0, 1010, 0, 24, 85, 0, , 0, JPC, 318, 7, , 1 AL, 09, 2021082800, 03, OFCL, 3, 229N, 839W, 69, 989, HU, 34, NEQ, 115, 71, 49, 83, 1010, 0, 22, 85, 0, , 0, JPC, 318, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 229N, 839W, 69, 989, HU, 50, NEQ, 59, 36, 30, 36, 1010, 0, 22, 85, 0, , 0, JPC, 318, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 229N, 839W, 69, 989, HU, 64, NEQ, 21, 0, 0, 0, 1010, 0, 22, 85, 0, , 0, JPC, 318, 7, , 2 AL, 09, 2021082800, 03, OFCL, 12, 243N, 854W, 83, 974, HU, 34, NEQ, 137, 103, 79, 115, 1010, 0, 24, 105, 0, , 0, JPC, 315, 7, , 3 AL, 09, 2021082800, 03, OFCL, 12, 243N, 854W, 83, 974, HU, 50, NEQ, 66, 54, 21, 54, 1010, 0, 24, 105, 0, , 0, JPC, 315, 7, , 3 -AL, 09, 2021082800, 03, OFCL, 12, 243N, 854W, 83, 974, HU, 64, NEQ, 21, 0, 15, 20, 1010, 0, 24, 105, 0, , 0, JPC, 315, 7, , 3 +AL, 09, 2021082800, 03, OFCL, 12, 243N, 854W, 83, 974, HU, 64, NEQ, 21, 22, 15, 20, 1010, 0, 24, 105, 0, , 0, JPC, 315, 7, , 3 AL, 09, 2021082800, 03, OFCL, 24, 259N, 873W, 102, 956, HU, 34, NEQ, 171, 146, 107, 146, 1010, 0, 23, 130, 0, , 0, JPC, 313, 6, , 4 AL, 09, 2021082800, 03, OFCL, 24, 259N, 873W, 102, 956, HU, 50, NEQ, 93, 79, 50, 65, 1010, 0, 23, 130, 0, , 0, JPC, 313, 6, , 4 -AL, 09, 2021082800, 03, OFCL, 24, 259N, 873W, 102, 956, HU, 64, NEQ, 18, 18, 0, 18, 1010, 0, 23, 130, 0, , 0, JPC, 313, 6, , 4 +AL, 09, 2021082800, 03, OFCL, 24, 259N, 873W, 102, 956, HU, 64, NEQ, 18, 18, 21, 18, 1010, 0, 23, 130, 0, , 0, JPC, 313, 6, , 4 AL, 09, 2021082800, 03, OFCL, 36, 275N, 891W, 117, 940, HU, 34, NEQ, 195, 170, 129, 170, 1010, 0, 23, 145, 0, , 0, JPC, 315, 6, , 5 AL, 09, 2021082800, 03, OFCL, 36, 275N, 891W, 117, 940, HU, 50, NEQ, 100, 100, 54, 86, 1010, 0, 23, 145, 0, , 0, JPC, 315, 6, , 5 AL, 09, 2021082800, 03, OFCL, 36, 275N, 891W, 117, 940, HU, 64, NEQ, 62, 54, 17, 54, 1010, 0, 23, 145, 0, , 0, JPC, 315, 6, , 5 @@ -17,7 +17,7 @@ AL, 09, 2021082800, 03, OFCL, 48, 287N, 902W, 106, 952, HU, 34, NEQ, 160, AL, 09, 2021082800, 03, OFCL, 48, 287N, 902W, 106, 952, HU, 50, NEQ, 94, 94, 66, 66, 1010, 0, 27, 135, 0, , 0, JPC, 322, 4, , 6 AL, 09, 2021082800, 03, OFCL, 48, 287N, 902W, 106, 952, HU, 64, NEQ, 50, 51, 23, 23, 1010, 0, 27, 135, 0, , 0, JPC, 322, 4, , 6 AL, 09, 2021082800, 03, OFCL, 60, 299N, 907W, 56, 994, TS, 34, NEQ, 92, 124, 82, 71, 1010, 0, 34, 75, 0, , 0, JPC, 339, 3, , 7 -AL, 09, 2021082800, 03, OFCL, 60, 299N, 907W, 56, 994, TS, 50, NEQ, 28, 28, 0, 0, 1010, 0, 34, 75, 0, , 0, JPC, 339, 3, , 7 +AL, 09, 2021082800, 03, OFCL, 60, 299N, 907W, 56, 994, TS, 50, NEQ, 28, 28, 0, 33, 1010, 0, 34, 75, 0, , 0, JPC, 339, 3, , 7 AL, 09, 2021082800, 03, OFCL, 72, 312N, 906W, 31, 1005, TS, 34, NEQ, 0, 0, 0, 0, 1010, 0, 87, 45, 0, , 0, JPC, 3, 3, , 8 AL, 09, 2021082800, 03, OFCL, 96, 335N, 890W, 21, 1008, TD, 34, NEQ, 0, 0, 0, 0, 1010, 0, 114, 35, 0, , 0, JPC, 30, 3, , 9 AL, 09, 2021082800, 03, OFCL, 120, 355N, 857W, 16, 1008, LO, 34, NEQ, 0, 0, 0, 0, 1010, 0, 127, 30, 0, , 0, JPC, 53, 4, , 10 diff --git a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_6.22 b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_6.22 index e4b4a9e7..b200ed53 100644 --- a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_6.22 +++ b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_6.22 @@ -1,6 +1,6 @@ AL, 09, 2021082800, 03, OFCL, 0, 225N, 836W, 71, 984, HU, 34, NEQ, 87, 51, 34, 61, 1010, 0, 16, 85, 0, , 0, JPC, 316, 7, , 1 AL, 09, 2021082800, 03, OFCL, 0, 225N, 836W, 71, 984, HU, 50, NEQ, 43, 25, 27, 25, 1010, 0, 16, 85, 0, , 0, JPC, 316, 7, , 1 -AL, 09, 2021082800, 03, OFCL, 0, 225N, 836W, 71, 984, HU, 64, NEQ, 0, 21, 0, 0, 1010, 0, 16, 85, 0, , 0, JPC, 316, 7, , 1 +AL, 09, 2021082800, 03, OFCL, 0, 225N, 836W, 71, 984, HU, 64, NEQ, 16, 21, 0, 0, 1010, 0, 16, 85, 0, , 0, JPC, 316, 7, , 1 AL, 09, 2021082800, 03, OFCL, 3, 231N, 841W, 71, 989, HU, 34, NEQ, 84, 48, 31, 56, 1010, 0, 14, 85, 0, , 0, JPC, 316, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 231N, 841W, 71, 989, HU, 50, NEQ, 40, 23, 18, 23, 1010, 0, 14, 85, 0, , 0, JPC, 316, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 231N, 841W, 71, 989, HU, 64, NEQ, 15, 15, 0, 0, 1010, 0, 14, 85, 0, , 0, JPC, 316, 7, , 2 @@ -9,7 +9,7 @@ AL, 09, 2021082800, 03, OFCL, 12, 245N, 858W, 87, 972, HU, 50, NEQ, 31, AL, 09, 2021082800, 03, OFCL, 12, 245N, 858W, 87, 972, HU, 64, NEQ, 12, 11, 17, 12, 1010, 0, 9, 105, 0, , 0, JPC, 313, 7, , 3 AL, 09, 2021082800, 03, OFCL, 24, 263N, 880W, 108, 951, HU, 34, NEQ, 61, 48, 31, 48, 1010, 0, 5, 130, 0, , 0, JPC, 312, 7, , 4 AL, 09, 2021082800, 03, OFCL, 24, 263N, 880W, 108, 951, HU, 50, NEQ, 26, 21, 12, 17, 1010, 0, 5, 130, 0, , 0, JPC, 312, 7, , 4 -AL, 09, 2021082800, 03, OFCL, 24, 263N, 880W, 108, 951, HU, 64, NEQ, 8, 8, 5, 8, 1010, 0, 5, 130, 0, , 0, JPC, 312, 7, , 4 +AL, 09, 2021082800, 03, OFCL, 24, 263N, 880W, 108, 951, HU, 64, NEQ, 8, 8, 6, 8, 1010, 0, 5, 130, 0, , 0, JPC, 312, 7, , 4 AL, 09, 2021082800, 03, OFCL, 36, 281N, 900W, 123, 933, HU, 34, NEQ, 71, 57, 39, 57, 1010, 0, 5, 145, 0, , 0, JPC, 316, 7, , 5 AL, 09, 2021082800, 03, OFCL, 36, 281N, 900W, 123, 933, HU, 50, NEQ, 28, 28, 13, 23, 1010, 0, 5, 145, 0, , 0, JPC, 316, 7, , 5 AL, 09, 2021082800, 03, OFCL, 36, 281N, 900W, 123, 933, HU, 64, NEQ, 15, 13, 8, 13, 1010, 0, 5, 145, 0, , 0, JPC, 316, 7, , 5 diff --git a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_7.22 b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_7.22 index 2e53184d..02ce0851 100644 --- a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_7.22 +++ b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_7.22 @@ -1,23 +1,23 @@ AL, 09, 2021082800, 03, OFCL, 0, 224N, 834W, 71, 984, HU, 34, NEQ, 123, 75, 51, 88, 1010, 0, 25, 85, 0, , 0, JPC, 315, 6, , 1 AL, 09, 2021082800, 03, OFCL, 0, 224N, 834W, 71, 984, HU, 50, NEQ, 64, 39, 42, 39, 1010, 0, 25, 85, 0, , 0, JPC, 315, 6, , 1 -AL, 09, 2021082800, 03, OFCL, 0, 224N, 834W, 71, 984, HU, 64, NEQ, 0, 33, 0, 0, 1010, 0, 25, 85, 0, , 0, JPC, 315, 6, , 1 +AL, 09, 2021082800, 03, OFCL, 0, 224N, 834W, 71, 984, HU, 64, NEQ, 25, 33, 0, 0, 1010, 0, 25, 85, 0, , 0, JPC, 315, 6, , 1 AL, 09, 2021082800, 03, OFCL, 3, 228N, 839W, 72, 987, HU, 34, NEQ, 131, 82, 57, 98, 1010, 0, 25, 85, 0, , 0, JPC, 315, 6, , 2 AL, 09, 2021082800, 03, OFCL, 3, 228N, 839W, 72, 987, HU, 50, NEQ, 69, 42, 37, 45, 1010, 0, 25, 85, 0, , 0, JPC, 315, 6, , 2 AL, 09, 2021082800, 03, OFCL, 3, 228N, 839W, 72, 987, HU, 64, NEQ, 23, 31, 0, 0, 1010, 0, 25, 85, 0, , 0, JPC, 315, 6, , 2 AL, 09, 2021082800, 03, OFCL, 12, 241N, 854W, 89, 969, HU, 34, NEQ, 166, 125, 99, 142, 1010, 0, 27, 105, 0, , 0, JPC, 312, 6, , 3 AL, 09, 2021082800, 03, OFCL, 12, 241N, 854W, 89, 969, HU, 50, NEQ, 82, 67, 23, 69, 1010, 0, 27, 105, 0, , 0, JPC, 312, 6, , 3 -AL, 09, 2021082800, 03, OFCL, 12, 241N, 854W, 89, 969, HU, 64, NEQ, 24, 0, 14, 23, 1010, 0, 27, 105, 0, , 0, JPC, 312, 6, , 3 +AL, 09, 2021082800, 03, OFCL, 12, 241N, 854W, 89, 969, HU, 64, NEQ, 24, 25, 14, 23, 1010, 0, 27, 105, 0, , 0, JPC, 312, 6, , 3 AL, 09, 2021082800, 03, OFCL, 24, 256N, 874W, 111, 946, HU, 34, NEQ, 216, 186, 139, 188, 1010, 0, 28, 130, 0, , 0, JPC, 311, 6, , 4 AL, 09, 2021082800, 03, OFCL, 24, 256N, 874W, 111, 946, HU, 50, NEQ, 121, 104, 65, 85, 1010, 0, 28, 130, 0, , 0, JPC, 311, 6, , 4 -AL, 09, 2021082800, 03, OFCL, 24, 256N, 874W, 111, 946, HU, 64, NEQ, 22, 22, 0, 21, 1010, 0, 28, 130, 0, , 0, JPC, 311, 6, , 4 +AL, 09, 2021082800, 03, OFCL, 24, 256N, 874W, 111, 946, HU, 64, NEQ, 22, 22, 26, 21, 1010, 0, 28, 130, 0, , 0, JPC, 311, 6, , 4 AL, 09, 2021082800, 03, OFCL, 36, 271N, 892W, 127, 927, HU, 34, NEQ, 249, 218, 169, 220, 1010, 0, 29, 145, 0, , 0, JPC, 313, 6, , 5 AL, 09, 2021082800, 03, OFCL, 36, 271N, 892W, 127, 927, HU, 50, NEQ, 132, 133, 72, 114, 1010, 0, 29, 145, 0, , 0, JPC, 313, 6, , 5 AL, 09, 2021082800, 03, OFCL, 36, 271N, 892W, 127, 927, HU, 64, NEQ, 83, 72, 21, 73, 1010, 0, 29, 145, 0, , 0, JPC, 313, 6, , 5 -AL, 09, 2021082800, 03, OFCL, 48, 283N, 904W, 117, 938, HU, 34, NEQ, 206, 207, 142, 141, 1010, 0, 34, 135, 0, , 0, JPC, 318, 4, , 6 +AL, 09, 2021082800, 03, OFCL, 48, 283N, 904W, 117, 938, HU, 34, NEQ, 207, 207, 142, 141, 1010, 0, 34, 135, 0, , 0, JPC, 318, 4, , 6 AL, 09, 2021082800, 03, OFCL, 48, 283N, 904W, 117, 938, HU, 50, NEQ, 124, 125, 87, 87, 1010, 0, 34, 135, 0, , 0, JPC, 318, 4, , 6 -AL, 09, 2021082800, 03, OFCL, 48, 283N, 904W, 117, 938, HU, 64, NEQ, 22, 22, 0, 0, 1010, 0, 34, 135, 0, , 0, JPC, 318, 4, , 6 +AL, 09, 2021082800, 03, OFCL, 48, 283N, 904W, 117, 938, HU, 64, NEQ, 22, 22, 28, 28, 1010, 0, 34, 135, 0, , 0, JPC, 318, 4, , 6 AL, 09, 2021082800, 03, OFCL, 60, 295N, 912W, 68, 985, TS, 34, NEQ, 135, 192, 126, 102, 1010, 0, 41, 75, 0, , 0, JPC, 329, 3, , 7 -AL, 09, 2021082800, 03, OFCL, 60, 295N, 912W, 68, 985, TS, 50, NEQ, 30, 29, 34, 0, 1010, 0, 41, 75, 0, , 0, JPC, 329, 3, , 7 +AL, 09, 2021082800, 03, OFCL, 60, 295N, 912W, 68, 985, TS, 50, NEQ, 30, 29, 34, 37, 1010, 0, 41, 75, 0, , 0, JPC, 329, 3, , 7 AL, 09, 2021082800, 03, OFCL, 72, 310N, 914W, 44, 999, TS, 34, NEQ, 138, 131, 104, 115, 1010, 0, 94, 45, 0, , 0, JPC, 353, 4, , 8 AL, 09, 2021082800, 03, OFCL, 96, 337N, 902W, 34, 1003, TD, 34, NEQ, 0, 0, 0, 0, 1010, 0, 122, 35, 0, , 0, JPC, 20, 4, , 9 AL, 09, 2021082800, 03, OFCL, 120, 362N, 876W, 28, 1004, LO, 34, NEQ, 0, 0, 0, 0, 1010, 0, 135, 30, 0, , 0, JPC, 41, 4, , 10 diff --git a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_8.22 b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_8.22 index 84d9edca..9c9c3108 100644 --- a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_8.22 +++ b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_8.22 @@ -1,6 +1,6 @@ AL, 09, 2021082800, 03, OFCL, 0, 225N, 835W, 72, 983, HU, 34, NEQ, 109, 65, 43, 77, 1010, 0, 21, 85, 0, , 0, JPC, 314, 7, , 1 AL, 09, 2021082800, 03, OFCL, 0, 225N, 835W, 72, 983, HU, 50, NEQ, 56, 33, 36, 33, 1010, 0, 21, 85, 0, , 0, JPC, 314, 7, , 1 -AL, 09, 2021082800, 03, OFCL, 0, 225N, 835W, 72, 983, HU, 64, NEQ, 0, 29, 0, 0, 1010, 0, 21, 85, 0, , 0, JPC, 314, 7, , 1 +AL, 09, 2021082800, 03, OFCL, 0, 225N, 835W, 72, 983, HU, 64, NEQ, 21, 29, 0, 0, 1010, 0, 21, 85, 0, , 0, JPC, 314, 7, , 1 AL, 09, 2021082800, 03, OFCL, 3, 229N, 840W, 73, 987, HU, 34, NEQ, 113, 68, 46, 81, 1010, 0, 19, 85, 0, , 0, JPC, 314, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 229N, 840W, 73, 987, HU, 50, NEQ, 58, 34, 29, 36, 1010, 0, 19, 85, 0, , 0, JPC, 314, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 229N, 840W, 73, 987, HU, 64, NEQ, 22, 25, 0, 0, 1010, 0, 19, 85, 0, , 0, JPC, 314, 7, , 2 diff --git a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_9.22 b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_9.22 index 42759e5d..48f74d4b 100644 --- a/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_9.22 +++ b/tests/data/reference/test_online_advisory/vortex_4_variable_korobov_9.22 @@ -1,6 +1,6 @@ AL, 09, 2021082800, 03, OFCL, 0, 225N, 836W, 74, 982, HU, 34, NEQ, 99, 58, 38, 69, 1010, 0, 18, 85, 0, , 0, JPC, 312, 7, , 1 AL, 09, 2021082800, 03, OFCL, 0, 225N, 836W, 74, 982, HU, 50, NEQ, 49, 28, 32, 29, 1010, 0, 18, 85, 0, , 0, JPC, 312, 7, , 1 -AL, 09, 2021082800, 03, OFCL, 0, 225N, 836W, 74, 982, HU, 64, NEQ, 0, 25, 0, 20, 1010, 0, 18, 85, 0, , 0, JPC, 312, 7, , 1 +AL, 09, 2021082800, 03, OFCL, 0, 225N, 836W, 74, 982, HU, 64, NEQ, 18, 25, 0, 20, 1010, 0, 18, 85, 0, , 0, JPC, 312, 7, , 1 AL, 09, 2021082800, 03, OFCL, 3, 229N, 842W, 75, 986, HU, 34, NEQ, 99, 57, 38, 69, 1010, 0, 15, 85, 0, , 0, JPC, 312, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 229N, 842W, 75, 986, HU, 50, NEQ, 50, 28, 24, 30, 1010, 0, 15, 85, 0, , 0, JPC, 312, 7, , 2 AL, 09, 2021082800, 03, OFCL, 3, 229N, 842W, 75, 986, HU, 64, NEQ, 18, 21, 0, 0, 1010, 0, 15, 85, 0, , 0, JPC, 312, 7, , 2 From d3b10cf35ec1abe2d675589092b4bdbb01e6e578 Mon Sep 17 00:00:00 2001 From: William Pringle Date: Fri, 6 Sep 2024 13:26:09 -0500 Subject: [PATCH 10/10] updating besttrack test files with the convergence changes --- .../vortex_1_variable_perturbation_1.22 | 10 +++++----- .../vortex_1_variable_perturbation_2.22 | 8 ++++---- .../vortex_1_variable_perturbation_3.22 | 8 ++++---- .../vortex_1_variable_perturbation_4.22 | 6 +++--- .../vortex_1_variable_perturbation_5.22 | 6 +++--- .../vortex_1_variable_perturbation_6.22 | 6 +++--- .../vortex_1_variable_perturbation_7.22 | 20 +++++++++---------- .../vortex_1_variable_perturbation_8.22 | 18 ++++++++--------- .../vortex_4_variable_perturbation_1.22 | 20 +++++++++---------- .../vortex_4_variable_perturbation_2.22 | 16 +++++++-------- .../vortex_4_variable_perturbation_3.22 | 16 +++++++-------- 11 files changed, 67 insertions(+), 67 deletions(-) diff --git a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_1.22 b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_1.22 index 3a7eab6d..20894b68 100644 --- a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_1.22 +++ b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_1.22 @@ -32,7 +32,7 @@ AL, 06, 2018091312, , BEST, 0, 331N, 751W, 98, 950, HU, 34, NEQ, 177, AL, 06, 2018091312, , BEST, 0, 331N, 751W, 98, 950, HU, 50, NEQ, 105, 94, 85, 84, 1011, 200, 20, 115, 0, L, 0, , 313, 5, FLORENCE, 11 AL, 06, 2018091312, , BEST, 0, 331N, 751W, 98, 950, HU, 64, NEQ, 74, 64, 54, 64, 1011, 200, 20, 115, 0, L, 0, , 313, 5, FLORENCE, 11 AL, 06, 2018091318, , BEST, 0, 336N, 760W, 93, 949, HU, 34, NEQ, 178, 157, 126, 147, 1011, 200, 20, 110, 0, L, 0, , 304, 5, FLORENCE, 12 -AL, 06, 2018091318, , BEST, 0, 336N, 760W, 93, 949, HU, 50, NEQ, 106, 95, 85, 85, 1011, 200, 20, 110, 0, L, 0, , 304, 5, FLORENCE, 12 +AL, 06, 2018091318, , BEST, 0, 336N, 760W, 93, 949, HU, 50, NEQ, 105, 95, 85, 85, 1011, 200, 20, 110, 0, L, 0, , 304, 5, FLORENCE, 12 AL, 06, 2018091318, , BEST, 0, 336N, 760W, 93, 949, HU, 64, NEQ, 75, 64, 54, 65, 1011, 200, 20, 110, 0, L, 0, , 304, 5, FLORENCE, 12 AL, 06, 2018091400, , BEST, 0, 340N, 765W, 93, 948, HU, 34, NEQ, 178, 157, 136, 104, 1012, 200, 20, 105, 0, L, 0, , 314, 3, FLORENCE, 13 AL, 06, 2018091400, , BEST, 0, 340N, 765W, 93, 948, HU, 50, NEQ, 105, 84, 85, 74, 1012, 200, 20, 105, 0, L, 0, , 314, 3, FLORENCE, 13 @@ -60,11 +60,11 @@ AL, 06, 2018091518, , BEST, 0, 336N, 798W, 53, 995, TS, 50, NEQ, 129, AL, 06, 2018091600, , BEST, 0, 336N, 802W, 47, 997, TS, 34, NEQ, 132, 132, 163, 167, 1013, 240, 110, 50, 0, L, 0, , 270, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 336N, 808W, 42, 998, TS, 34, NEQ, 134, 135, 136, 145, 1013, 260, 110, 40, 0, L, 0, , 270, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 336N, 815W, 37, 1001, TS, 34, NEQ, 169, 154, 0, 0, 1013, 280, 140, 40, 0, L, 0, , 270, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 341N, 821W, 32, 1005, TD, 0, , 0, 0, 0, 0, 1013, 300, 140, 40, 0, L, 0, , 315, 4, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 350N, 822W, 27, 1006, TD, 0, , 0, 0, 432, 0, 1013, 320, 150, 35, 0, L, 0, , 355, 5, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 341N, 821W, 32, 1005, TD, 0, , 0, 0, 435, 560, 1013, 300, 140, 40, 0, L, 0, , 315, 4, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 350N, 822W, 27, 1006, TD, 0, , 0, 0, 432, 581, 1013, 320, 150, 35, 0, L, 0, , 355, 5, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 364N, 826W, 27, 1007, TD, 0, , 0, 0, 343, 480, 1013, 340, 160, 35, 0, L, 0, , 347, 7, FLORENCE, 27 -AL, 06, 2018091712, , BEST, 0, 378N, 822W, 27, 1007, EX, 0, , 0, 0, 338, 471, 1013, 360, 160, 30, 0, L, 0, , 13, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 388N, 820W, 27, 1007, EX, 0, , 0, 0, 367, 0, 1013, 360, 160, 30, 0, L, 0, , 9, 5, FLORENCE, 29 +AL, 06, 2018091712, , BEST, 0, 378N, 822W, 27, 1007, EX, 0, , 0, 0, 339, 471, 1013, 360, 160, 30, 0, L, 0, , 13, 7, FLORENCE, 28 +AL, 06, 2018091718, , BEST, 0, 388N, 820W, 27, 1007, EX, 0, , 0, 0, 367, 475, 1013, 360, 160, 30, 0, L, 0, , 9, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 395N, 805W, 27, 1007, EX, 0, , 0, 0, 339, 462, 1013, 360, 160, 0, 0, , 0, , 59, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 413N, 768W, 27, 1007, EX, 0, , 0, 0, 0, 316, 1013, 360, 170, 0, 0, , 0, , 56, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 422N, 733W, 27, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 180, 30, 0, L, 0, , 70, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_2.22 b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_2.22 index 0baebcc6..3c26414a 100644 --- a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_2.22 +++ b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_2.22 @@ -37,7 +37,7 @@ AL, 06, 2018091318, , BEST, 0, 336N, 760W, 87, 957, HU, 64, NEQ, 65, AL, 06, 2018091400, , BEST, 0, 340N, 765W, 87, 956, HU, 34, NEQ, 162, 143, 124, 96, 1012, 200, 20, 105, 0, L, 0, , 314, 3, FLORENCE, 13 AL, 06, 2018091400, , BEST, 0, 340N, 765W, 87, 956, HU, 50, NEQ, 95, 76, 75, 66, 1012, 200, 20, 105, 0, L, 0, , 314, 3, FLORENCE, 13 AL, 06, 2018091400, , BEST, 0, 340N, 765W, 87, 956, HU, 64, NEQ, 65, 56, 46, 47, 1012, 200, 20, 105, 0, L, 0, , 314, 3, FLORENCE, 13 -AL, 06, 2018091406, , BEST, 0, 342N, 772W, 82, 956, HU, 34, NEQ, 162, 143, 123, 95, 1012, 200, 20, 100, 0, L, 0, , 289, 3, FLORENCE, 14 +AL, 06, 2018091406, , BEST, 0, 342N, 772W, 82, 956, HU, 34, NEQ, 161, 143, 123, 95, 1012, 200, 20, 100, 0, L, 0, , 289, 3, FLORENCE, 14 AL, 06, 2018091406, , BEST, 0, 342N, 772W, 82, 956, HU, 50, NEQ, 94, 75, 75, 66, 1012, 200, 20, 100, 0, L, 0, , 289, 3, FLORENCE, 14 AL, 06, 2018091406, , BEST, 0, 342N, 772W, 82, 956, HU, 64, NEQ, 64, 55, 53, 46, 1012, 200, 20, 100, 0, L, 0, , 289, 3, FLORENCE, 14 AL, 06, 2018091411, 15, BEST, 0, 342N, 778W, 77, 960, HU, 34, NEQ, 161, 142, 132, 86, 1012, 200, 25, 0, 0, , 0, , 270, 3, FLORENCE, 15 @@ -58,11 +58,11 @@ AL, 06, 2018091518, , BEST, 0, 336N, 798W, 47, 999, TS, 34, NEQ, 136, AL, 06, 2018091600, , BEST, 0, 336N, 802W, 43, 999, TS, 34, NEQ, 128, 127, 148, 152, 1013, 240, 110, 50, 0, L, 0, , 270, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 336N, 808W, 38, 1000, TS, 34, NEQ, 126, 124, 0, 0, 1013, 260, 110, 40, 0, L, 0, , 270, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 336N, 815W, 33, 1003, TS, 34, NEQ, 0, 0, 0, 0, 1013, 280, 140, 40, 0, L, 0, , 270, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 341N, 821W, 28, 1007, TD, 0, , 0, 0, 0, 0, 1013, 300, 140, 40, 0, L, 0, , 315, 4, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 350N, 822W, 23, 1008, TD, 0, , 0, 0, 361, 0, 1013, 320, 150, 35, 0, L, 0, , 355, 5, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 341N, 821W, 28, 1007, TD, 0, , 0, 0, 383, 486, 1013, 300, 140, 40, 0, L, 0, , 315, 4, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 350N, 822W, 23, 1008, TD, 0, , 0, 0, 361, 476, 1013, 320, 150, 35, 0, L, 0, , 355, 5, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 364N, 826W, 23, 1009, TD, 0, , 0, 0, 279, 383, 1013, 340, 160, 35, 0, L, 0, , 347, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 378N, 822W, 23, 1009, EX, 0, , 0, 0, 276, 376, 1013, 360, 160, 30, 0, L, 0, , 13, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 388N, 820W, 23, 1009, EX, 0, , 0, 0, 312, 0, 1013, 360, 160, 30, 0, L, 0, , 9, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 388N, 820W, 23, 1009, EX, 0, , 0, 0, 312, 397, 1013, 360, 160, 30, 0, L, 0, , 9, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 395N, 805W, 23, 1009, EX, 0, , 0, 0, 279, 373, 1013, 360, 160, 0, 0, , 0, , 59, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 413N, 768W, 23, 1007, EX, 0, , 0, 0, 0, 316, 1013, 360, 170, 0, 0, , 0, , 56, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 422N, 733W, 23, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 180, 30, 0, L, 0, , 70, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_3.22 b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_3.22 index b98646e2..fae70a13 100644 --- a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_3.22 +++ b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_3.22 @@ -45,7 +45,7 @@ AL, 06, 2018091411, 15, BEST, 0, 343N, 778W, 80, 956, HU, 50, NEQ, 100, AL, 06, 2018091411, 15, BEST, 0, 343N, 778W, 80, 956, HU, 64, NEQ, 70, 60, 59, 40, 1012, 200, 25, 0, 0, , 0, , 270, 3, FLORENCE, 15 AL, 06, 2018091412, , BEST, 0, 342N, 779W, 80, 958, HU, 34, NEQ, 170, 150, 138, 79, 1012, 200, 25, 90, 0, L, 0, , 221, 6, FLORENCE, 16 AL, 06, 2018091412, , BEST, 0, 342N, 779W, 80, 958, HU, 50, NEQ, 100, 80, 78, 40, 1012, 200, 25, 90, 0, L, 0, , 221, 6, FLORENCE, 16 -AL, 06, 2018091412, , BEST, 0, 342N, 779W, 80, 958, HU, 64, NEQ, 60, 60, 55, 20, 1012, 200, 25, 90, 0, L, 0, , 221, 6, FLORENCE, 16 +AL, 06, 2018091412, , BEST, 0, 342N, 779W, 80, 958, HU, 64, NEQ, 60, 60, 56, 20, 1012, 200, 25, 90, 0, L, 0, , 221, 6, FLORENCE, 16 AL, 06, 2018091418, , BEST, 0, 341N, 784W, 65, 969, HU, 34, NEQ, 150, 130, 121, 70, 1012, 200, 30, 80, 0, L, 0, , 257, 2, FLORENCE, 17 AL, 06, 2018091418, , BEST, 0, 341N, 784W, 65, 969, HU, 50, NEQ, 90, 70, 60, 30, 1012, 200, 30, 80, 0, L, 0, , 257, 2, FLORENCE, 17 AL, 06, 2018091418, , BEST, 0, 341N, 784W, 65, 969, HU, 64, NEQ, 34, 0, 0, 0, 1012, 200, 30, 80, 0, L, 0, , 257, 2, FLORENCE, 17 @@ -59,11 +59,11 @@ AL, 06, 2018091518, , BEST, 0, 337N, 798W, 50, 997, TS, 34, NEQ, 140, AL, 06, 2018091600, , BEST, 0, 337N, 802W, 45, 998, TS, 34, NEQ, 130, 130, 156, 160, 1013, 240, 110, 50, 0, L, 0, , 278, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 337N, 808W, 40, 999, TS, 34, NEQ, 130, 130, 117, 132, 1013, 260, 110, 40, 0, L, 0, , 270, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 337N, 815W, 35, 1002, TS, 34, NEQ, 147, 0, 0, 0, 1013, 280, 140, 40, 0, L, 0, , 269, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 341N, 820W, 30, 1006, TD, 0, , 0, 0, 0, 0, 1013, 300, 140, 40, 0, L, 0, , 315, 3, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 350N, 821W, 25, 1007, TD, 0, , 0, 0, 404, 0, 1013, 320, 150, 35, 0, L, 0, , 355, 4, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 341N, 820W, 30, 1006, TD, 0, , 0, 0, 432, 552, 1013, 300, 140, 40, 0, L, 0, , 315, 3, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 350N, 821W, 25, 1007, TD, 0, , 0, 0, 404, 539, 1013, 320, 150, 35, 0, L, 0, , 355, 4, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 364N, 825W, 25, 1008, TD, 0, , 0, 0, 314, 435, 1013, 340, 160, 35, 0, L, 0, , 347, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 378N, 821W, 25, 1008, EX, 0, , 0, 0, 311, 428, 1013, 360, 160, 30, 0, L, 0, , 13, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 387N, 819W, 25, 1008, EX, 0, , 0, 0, 348, 0, 1013, 360, 160, 30, 0, L, 0, , 8, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 387N, 819W, 25, 1008, EX, 0, , 0, 0, 348, 447, 1013, 360, 160, 30, 0, L, 0, , 8, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 394N, 804W, 25, 1008, EX, 0, , 0, 0, 317, 428, 1013, 360, 160, 0, 0, , 0, , 59, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 412N, 767W, 25, 1007, EX, 0, , 0, 0, 0, 317, 1013, 360, 170, 0, 0, , 0, , 56, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 421N, 733W, 25, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 180, 30, 0, L, 0, , 70, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_4.22 b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_4.22 index aa08a158..45b531ee 100644 --- a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_4.22 +++ b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_4.22 @@ -59,11 +59,11 @@ AL, 06, 2018091518, , BEST, 0, 335N, 798W, 50, 997, TS, 34, NEQ, 140, AL, 06, 2018091600, , BEST, 0, 335N, 802W, 45, 998, TS, 34, NEQ, 130, 130, 156, 160, 1013, 240, 110, 50, 0, L, 0, , 263, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 335N, 808W, 40, 999, TS, 34, NEQ, 130, 130, 117, 132, 1013, 260, 110, 40, 0, L, 0, , 270, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 335N, 815W, 35, 1002, TS, 34, NEQ, 0, 0, 0, 0, 1013, 280, 140, 40, 0, L, 0, , 271, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 341N, 822W, 30, 1006, TD, 0, , 0, 0, 0, 0, 1013, 300, 140, 40, 0, L, 0, , 315, 4, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 350N, 823W, 25, 1007, TD, 0, , 0, 0, 387, 0, 1013, 320, 150, 35, 0, L, 0, , 354, 5, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 341N, 822W, 30, 1006, TD, 0, , 0, 0, 389, 497, 1013, 300, 140, 40, 0, L, 0, , 315, 4, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 350N, 823W, 25, 1007, TD, 0, , 0, 0, 387, 517, 1013, 320, 150, 35, 0, L, 0, , 354, 5, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 364N, 827W, 25, 1008, TD, 0, , 0, 0, 307, 425, 1013, 340, 160, 35, 0, L, 0, , 347, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 378N, 823W, 25, 1008, EX, 0, , 0, 0, 302, 417, 1013, 360, 160, 30, 0, L, 0, , 13, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 389N, 821W, 25, 1008, EX, 0, , 0, 0, 330, 0, 1013, 360, 160, 30, 0, L, 0, , 9, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 389N, 821W, 25, 1008, EX, 0, , 0, 0, 330, 424, 1013, 360, 160, 30, 0, L, 0, , 9, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 396N, 806W, 25, 1008, EX, 0, , 0, 0, 300, 405, 1013, 360, 160, 0, 0, , 0, , 58, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 414N, 769W, 25, 1007, EX, 0, , 0, 0, 0, 315, 1013, 360, 170, 0, 0, , 0, , 56, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 423N, 733W, 25, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 180, 30, 0, L, 0, , 70, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_5.22 b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_5.22 index c5733f53..b443dc0c 100644 --- a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_5.22 +++ b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_5.22 @@ -59,11 +59,11 @@ AL, 06, 2018091518, , BEST, 0, 336N, 799W, 50, 997, TS, 34, NEQ, 140, AL, 06, 2018091600, , BEST, 0, 336N, 804W, 45, 998, TS, 34, NEQ, 130, 130, 153, 158, 1013, 240, 110, 50, 0, L, 0, , 270, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 336N, 810W, 40, 999, TS, 34, NEQ, 130, 130, 117, 132, 1013, 260, 110, 40, 0, L, 0, , 270, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 337N, 816W, 35, 1002, TS, 34, NEQ, 146, 0, 0, 0, 1013, 280, 140, 40, 0, L, 0, , 280, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 342N, 821W, 30, 1006, TD, 0, , 0, 0, 0, 0, 1013, 300, 140, 40, 0, L, 0, , 322, 4, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 351N, 822W, 25, 1007, TD, 0, , 0, 0, 395, 0, 1013, 320, 150, 35, 0, L, 0, , 354, 5, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 342N, 821W, 30, 1006, TD, 0, , 0, 0, 416, 531, 1013, 300, 140, 40, 0, L, 0, , 322, 4, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 351N, 822W, 25, 1007, TD, 0, , 0, 0, 395, 527, 1013, 320, 150, 35, 0, L, 0, , 354, 5, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 365N, 826W, 25, 1008, TD, 0, , 0, 0, 313, 433, 1013, 340, 160, 35, 0, L, 0, , 349, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 379N, 822W, 25, 1008, EX, 0, , 0, 0, 306, 422, 1013, 360, 160, 30, 0, L, 0, , 12, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 389N, 819W, 25, 1008, EX, 0, , 0, 0, 348, 0, 1013, 360, 160, 30, 0, L, 0, , 15, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 389N, 819W, 25, 1008, EX, 0, , 0, 0, 348, 446, 1013, 360, 160, 30, 0, L, 0, , 15, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 396N, 804W, 25, 1008, EX, 0, , 0, 0, 308, 416, 1013, 360, 160, 0, 0, , 0, , 58, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 413N, 766W, 25, 1007, EX, 0, , 0, 0, 0, 316, 1013, 360, 170, 0, 0, , 0, , 57, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 422N, 731W, 25, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 180, 30, 0, L, 0, , 70, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_6.22 b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_6.22 index 0f7389f5..aac689d8 100644 --- a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_6.22 +++ b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_6.22 @@ -59,11 +59,11 @@ AL, 06, 2018091518, , BEST, 0, 336N, 797W, 50, 997, TS, 34, NEQ, 140, AL, 06, 2018091600, , BEST, 0, 336N, 800W, 45, 998, TS, 34, NEQ, 130, 130, 159, 162, 1013, 240, 110, 50, 0, L, 0, , 270, 1, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 336N, 806W, 40, 999, TS, 34, NEQ, 130, 130, 117, 132, 1013, 260, 110, 40, 0, L, 0, , 270, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 336N, 813W, 35, 1002, TS, 34, NEQ, 144, 0, 0, 0, 1013, 280, 140, 40, 0, L, 0, , 270, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 340N, 820W, 30, 1006, TD, 0, , 0, 0, 0, 0, 1013, 300, 140, 40, 0, L, 0, , 307, 3, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 349N, 822W, 25, 1007, TD, 0, , 0, 0, 405, 0, 1013, 320, 150, 35, 0, L, 0, , 349, 5, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 340N, 820W, 30, 1006, TD, 0, , 0, 0, 419, 536, 1013, 300, 140, 40, 0, L, 0, , 307, 3, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 349N, 822W, 25, 1007, TD, 0, , 0, 0, 405, 540, 1013, 320, 150, 35, 0, L, 0, , 349, 5, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 363N, 826W, 25, 1008, TD, 0, , 0, 0, 311, 431, 1013, 340, 160, 35, 0, L, 0, , 348, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 377N, 822W, 25, 1008, EX, 0, , 0, 0, 309, 427, 1013, 360, 160, 30, 0, L, 0, , 10, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 387N, 820W, 25, 1008, EX, 0, , 0, 0, 340, 0, 1013, 360, 160, 30, 0, L, 0, , 9, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 387N, 820W, 25, 1008, EX, 0, , 0, 0, 340, 436, 1013, 360, 160, 30, 0, L, 0, , 9, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 394N, 806W, 25, 1008, EX, 0, , 0, 0, 318, 429, 1013, 360, 160, 0, 0, , 0, , 54, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 412N, 769W, 25, 1007, EX, 0, , 0, 0, 0, 316, 1013, 360, 170, 0, 0, , 0, , 56, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 422N, 735W, 25, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 180, 30, 0, L, 0, , 69, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_7.22 b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_7.22 index 2df1e2ad..cb2e1d04 100644 --- a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_7.22 +++ b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_7.22 @@ -7,7 +7,7 @@ AL, 06, 2018091106, , BEST, 0, 260N, 632W, 115, 950, HU, 64, NEQ, 44, AL, 06, 2018091112, , BEST, 0, 265N, 647W, 125, 947, HU, 34, NEQ, 166, 155, 109, 144, 1010, 200, 19, 140, 0, L, 0, , 291, 7, FLORENCE, 3 AL, 06, 2018091112, , BEST, 0, 265N, 647W, 125, 947, HU, 50, NEQ, 87, 75, 62, 86, 1010, 200, 19, 140, 0, L, 0, , 291, 7, FLORENCE, 3 AL, 06, 2018091112, , BEST, 0, 265N, 647W, 125, 947, HU, 64, NEQ, 50, 44, 44, 50, 1010, 200, 19, 140, 0, L, 0, , 291, 7, FLORENCE, 3 -AL, 06, 2018091118, , BEST, 0, 272N, 664W, 130, 937, HU, 34, NEQ, 188, 165, 129, 177, 1010, 200, 14, 145, 0, L, 0, , 295, 9, FLORENCE, 4 +AL, 06, 2018091118, , BEST, 0, 272N, 664W, 130, 937, HU, 34, NEQ, 189, 165, 129, 176, 1010, 200, 14, 145, 0, L, 0, , 295, 9, FLORENCE, 4 AL, 06, 2018091118, , BEST, 0, 272N, 664W, 130, 937, HU, 50, NEQ, 106, 81, 67, 93, 1010, 200, 14, 145, 0, L, 0, , 295, 9, FLORENCE, 4 AL, 06, 2018091118, , BEST, 0, 272N, 664W, 130, 937, HU, 64, NEQ, 68, 55, 55, 61, 1010, 200, 14, 145, 0, L, 0, , 295, 9, FLORENCE, 4 AL, 06, 2018091200, , BEST, 0, 279N, 681W, 120, 943, HU, 34, NEQ, 187, 164, 129, 175, 1010, 200, 14, 145, 0, L, 0, , 295, 9, FLORENCE, 5 @@ -47,23 +47,23 @@ AL, 06, 2018091412, , BEST, 0, 341N, 779W, 80, 957, HU, 34, NEQ, 186, AL, 06, 2018091412, , BEST, 0, 341N, 779W, 80, 957, HU, 50, NEQ, 112, 90, 90, 46, 1012, 200, 29, 90, 0, L, 0, , 220, 5, FLORENCE, 16 AL, 06, 2018091412, , BEST, 0, 341N, 779W, 80, 957, HU, 64, NEQ, 68, 68, 67, 23, 1012, 200, 29, 90, 0, L, 0, , 220, 5, FLORENCE, 16 AL, 06, 2018091418, , BEST, 0, 340N, 784W, 65, 969, HU, 34, NEQ, 162, 141, 131, 78, 1012, 200, 34, 80, 0, L, 0, , 257, 2, FLORENCE, 17 -AL, 06, 2018091418, , BEST, 0, 340N, 784W, 65, 969, HU, 50, NEQ, 99, 78, 67, 0, 1012, 200, 34, 80, 0, L, 0, , 257, 2, FLORENCE, 17 -AL, 06, 2018091418, , BEST, 0, 340N, 784W, 65, 969, HU, 64, NEQ, 38, 0, 0, 0, 1012, 200, 34, 80, 0, L, 0, , 257, 2, FLORENCE, 17 +AL, 06, 2018091418, , BEST, 0, 340N, 784W, 65, 969, HU, 50, NEQ, 99, 78, 67, 34, 1012, 200, 34, 80, 0, L, 0, , 257, 2, FLORENCE, 17 +AL, 06, 2018091418, , BEST, 0, 340N, 784W, 65, 969, HU, 64, NEQ, 39, 0, 0, 0, 1012, 200, 34, 80, 0, L, 0, , 257, 2, FLORENCE, 17 AL, 06, 2018091500, , BEST, 0, 339N, 788W, 60, 978, TS, 34, NEQ, 162, 162, 110, 67, 1013, 210, 34, 65, 0, L, 0, , 253, 2, FLORENCE, 18 -AL, 06, 2018091500, , BEST, 0, 339N, 788W, 60, 978, TS, 50, NEQ, 78, 78, 56, 0, 1013, 210, 34, 65, 0, L, 0, , 253, 2, FLORENCE, 18 -AL, 06, 2018091506, , BEST, 0, 337N, 793W, 55, 986, TS, 34, NEQ, 158, 158, 96, 0, 1013, 210, 54, 60, 0, L, 0, , 245, 2, FLORENCE, 19 +AL, 06, 2018091500, , BEST, 0, 339N, 788W, 60, 978, TS, 50, NEQ, 78, 78, 56, 34, 1013, 210, 34, 65, 0, L, 0, , 253, 2, FLORENCE, 18 +AL, 06, 2018091506, , BEST, 0, 337N, 793W, 55, 986, TS, 34, NEQ, 158, 158, 96, 54, 1013, 210, 54, 60, 0, L, 0, , 245, 2, FLORENCE, 19 AL, 06, 2018091506, , BEST, 0, 337N, 793W, 55, 986, TS, 50, NEQ, 75, 75, 0, 64, 1013, 210, 54, 60, 0, L, 0, , 245, 2, FLORENCE, 19 AL, 06, 2018091512, , BEST, 0, 336N, 795W, 55, 992, TS, 34, NEQ, 157, 137, 85, 43, 1013, 220, 64, 55, 0, L, 0, , 239, 1, FLORENCE, 20 -AL, 06, 2018091512, , BEST, 0, 336N, 795W, 55, 992, TS, 50, NEQ, 0, 106, 80, 82, 1013, 220, 64, 55, 0, L, 0, , 239, 1, FLORENCE, 20 +AL, 06, 2018091512, , BEST, 0, 336N, 795W, 55, 992, TS, 50, NEQ, 64, 106, 80, 82, 1013, 220, 64, 55, 0, L, 0, , 239, 1, FLORENCE, 20 AL, 06, 2018091518, , BEST, 0, 336N, 798W, 50, 997, TS, 34, NEQ, 145, 135, 174, 176, 1013, 220, 114, 50, 0, L, 0, , 270, 1, FLORENCE, 21 AL, 06, 2018091600, , BEST, 0, 336N, 802W, 45, 998, TS, 34, NEQ, 135, 135, 161, 165, 1013, 240, 114, 50, 0, L, 0, , 270, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 336N, 808W, 40, 999, TS, 34, NEQ, 135, 135, 121, 137, 1013, 260, 114, 40, 0, L, 0, , 270, 3, FLORENCE, 23 -AL, 06, 2018091612, , BEST, 0, 336N, 815W, 35, 1002, TS, 34, NEQ, 148, 0, 0, 0, 1013, 280, 144, 40, 0, L, 0, , 270, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 341N, 821W, 30, 1006, TD, 0, , 0, 0, 0, 0, 1013, 300, 144, 40, 0, L, 0, , 315, 4, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 350N, 822W, 25, 1007, TD, 0, , 0, 0, 401, 0, 1013, 320, 154, 35, 0, L, 0, , 355, 5, FLORENCE, 26 +AL, 06, 2018091612, , BEST, 0, 336N, 815W, 35, 1002, TS, 34, NEQ, 149, 0, 0, 0, 1013, 280, 144, 40, 0, L, 0, , 270, 3, FLORENCE, 24 +AL, 06, 2018091618, , BEST, 0, 341N, 821W, 30, 1006, TD, 0, , 0, 0, 414, 528, 1013, 300, 144, 40, 0, L, 0, , 315, 4, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 350N, 822W, 25, 1007, TD, 0, , 0, 0, 401, 532, 1013, 320, 154, 35, 0, L, 0, , 355, 5, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 364N, 826W, 25, 1008, TD, 0, , 0, 0, 315, 435, 1013, 340, 164, 35, 0, L, 0, , 347, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 378N, 822W, 25, 1008, EX, 0, , 0, 0, 311, 427, 1013, 360, 164, 30, 0, L, 0, , 13, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 388N, 820W, 25, 1008, EX, 0, , 0, 0, 344, 0, 1013, 360, 164, 30, 0, L, 0, , 9, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 388N, 820W, 25, 1008, EX, 0, , 0, 0, 344, 440, 1013, 360, 164, 30, 0, L, 0, , 9, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 395N, 805W, 25, 1008, EX, 0, , 0, 0, 313, 421, 1013, 360, 164, 0, 0, , 0, , 59, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 413N, 768W, 25, 1007, EX, 0, , 0, 0, 0, 321, 1013, 360, 174, 0, 0, , 0, , 56, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 422N, 733W, 25, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 184, 30, 0, L, 0, , 70, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_8.22 b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_8.22 index 53f26600..b18c1e55 100644 --- a/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_8.22 +++ b/tests/data/reference/test_monovariate_besttrack_ensemble/vortex_1_variable_perturbation_8.22 @@ -4,7 +4,7 @@ AL, 06, 2018091100, , BEST, 0, 256N, 618W, 115, 944, HU, 64, NEQ, 21, AL, 06, 2018091106, , BEST, 0, 260N, 632W, 115, 950, HU, 34, NEQ, 102, 102, 69, 111, 1010, 200, 11, 145, 0, L, 0, , 288, 7, FLORENCE, 2 AL, 06, 2018091106, , BEST, 0, 260N, 632W, 115, 950, HU, 50, NEQ, 45, 45, 37, 45, 1010, 200, 11, 145, 0, L, 0, , 288, 7, FLORENCE, 2 AL, 06, 2018091106, , BEST, 0, 260N, 632W, 115, 950, HU, 64, NEQ, 25, 22, 18, 26, 1010, 200, 11, 145, 0, L, 0, , 288, 7, FLORENCE, 2 -AL, 06, 2018091112, , BEST, 0, 265N, 647W, 125, 947, HU, 34, NEQ, 110, 102, 69, 94, 1010, 200, 11, 140, 0, L, 0, , 291, 7, FLORENCE, 3 +AL, 06, 2018091112, , BEST, 0, 265N, 647W, 125, 947, HU, 34, NEQ, 110, 102, 69, 93, 1010, 200, 11, 140, 0, L, 0, , 291, 7, FLORENCE, 3 AL, 06, 2018091112, , BEST, 0, 265N, 647W, 125, 947, HU, 50, NEQ, 52, 45, 37, 53, 1010, 200, 11, 140, 0, L, 0, , 291, 7, FLORENCE, 3 AL, 06, 2018091112, , BEST, 0, 265N, 647W, 125, 947, HU, 64, NEQ, 29, 25, 26, 29, 1010, 200, 11, 140, 0, L, 0, , 291, 7, FLORENCE, 3 AL, 06, 2018091118, , BEST, 0, 272N, 664W, 130, 937, HU, 34, NEQ, 103, 88, 65, 95, 1010, 200, 6, 145, 0, L, 0, , 295, 9, FLORENCE, 4 @@ -12,7 +12,7 @@ AL, 06, 2018091118, , BEST, 0, 272N, 664W, 130, 937, HU, 50, NEQ, 51, AL, 06, 2018091118, , BEST, 0, 272N, 664W, 130, 937, HU, 64, NEQ, 30, 24, 24, 27, 1010, 200, 6, 145, 0, L, 0, , 295, 9, FLORENCE, 4 AL, 06, 2018091200, , BEST, 0, 279N, 681W, 120, 943, HU, 34, NEQ, 104, 89, 66, 97, 1010, 200, 6, 145, 0, L, 0, , 295, 9, FLORENCE, 5 AL, 06, 2018091200, , BEST, 0, 279N, 681W, 120, 943, HU, 50, NEQ, 51, 37, 31, 44, 1010, 200, 6, 145, 0, L, 0, , 295, 9, FLORENCE, 5 -AL, 06, 2018091200, , BEST, 0, 279N, 681W, 120, 943, HU, 64, NEQ, 30, 27, 24, 27, 1010, 200, 6, 145, 0, L, 0, , 295, 9, FLORENCE, 5 +AL, 06, 2018091200, , BEST, 0, 279N, 681W, 120, 943, HU, 64, NEQ, 30, 27, 24, 28, 1010, 200, 6, 145, 0, L, 0, , 295, 9, FLORENCE, 5 AL, 06, 2018091206, , BEST, 0, 287N, 695W, 115, 945, HU, 34, NEQ, 120, 111, 86, 111, 1010, 200, 11, 140, 20, L, 0, , 303, 8, FLORENCE, 6 AL, 06, 2018091206, , BEST, 0, 287N, 695W, 115, 945, HU, 50, NEQ, 61, 49, 45, 53, 1010, 200, 11, 140, 20, L, 0, , 303, 8, FLORENCE, 6 AL, 06, 2018091206, , BEST, 0, 287N, 695W, 115, 945, HU, 64, NEQ, 45, 37, 30, 37, 1010, 200, 11, 140, 20, L, 0, , 303, 8, FLORENCE, 6 @@ -47,23 +47,23 @@ AL, 06, 2018091412, , BEST, 0, 341N, 779W, 80, 957, HU, 34, NEQ, 152, AL, 06, 2018091412, , BEST, 0, 341N, 779W, 80, 957, HU, 50, NEQ, 87, 69, 70, 34, 1012, 200, 21, 90, 0, L, 0, , 220, 5, FLORENCE, 16 AL, 06, 2018091412, , BEST, 0, 341N, 779W, 80, 957, HU, 64, NEQ, 51, 51, 53, 17, 1012, 200, 21, 90, 0, L, 0, , 220, 5, FLORENCE, 16 AL, 06, 2018091418, , BEST, 0, 340N, 784W, 65, 969, HU, 34, NEQ, 137, 118, 109, 62, 1012, 200, 26, 80, 0, L, 0, , 257, 2, FLORENCE, 17 -AL, 06, 2018091418, , BEST, 0, 340N, 784W, 65, 969, HU, 50, NEQ, 80, 62, 53, 0, 1012, 200, 26, 80, 0, L, 0, , 257, 2, FLORENCE, 17 +AL, 06, 2018091418, , BEST, 0, 340N, 784W, 65, 969, HU, 50, NEQ, 80, 62, 53, 26, 1012, 200, 26, 80, 0, L, 0, , 257, 2, FLORENCE, 17 AL, 06, 2018091418, , BEST, 0, 340N, 784W, 65, 969, HU, 64, NEQ, 29, 0, 0, 0, 1012, 200, 26, 80, 0, L, 0, , 257, 2, FLORENCE, 17 AL, 06, 2018091500, , BEST, 0, 339N, 788W, 60, 978, TS, 34, NEQ, 137, 137, 90, 53, 1013, 210, 26, 65, 0, L, 0, , 253, 2, FLORENCE, 18 -AL, 06, 2018091500, , BEST, 0, 339N, 788W, 60, 978, TS, 50, NEQ, 62, 62, 44, 0, 1013, 210, 26, 65, 0, L, 0, , 253, 2, FLORENCE, 18 -AL, 06, 2018091506, , BEST, 0, 337N, 793W, 55, 986, TS, 34, NEQ, 142, 142, 84, 0, 1013, 210, 46, 60, 0, L, 0, , 245, 2, FLORENCE, 19 +AL, 06, 2018091500, , BEST, 0, 339N, 788W, 60, 978, TS, 50, NEQ, 62, 62, 44, 26, 1013, 210, 26, 65, 0, L, 0, , 253, 2, FLORENCE, 18 +AL, 06, 2018091506, , BEST, 0, 337N, 793W, 55, 986, TS, 34, NEQ, 142, 142, 84, 46, 1013, 210, 46, 60, 0, L, 0, , 245, 2, FLORENCE, 19 AL, 06, 2018091506, , BEST, 0, 337N, 793W, 55, 986, TS, 50, NEQ, 65, 65, 0, 55, 1013, 210, 46, 60, 0, L, 0, , 245, 2, FLORENCE, 19 AL, 06, 2018091512, , BEST, 0, 336N, 795W, 55, 992, TS, 34, NEQ, 143, 123, 75, 37, 1013, 220, 56, 55, 0, L, 0, , 239, 1, FLORENCE, 20 -AL, 06, 2018091512, , BEST, 0, 336N, 795W, 55, 992, TS, 50, NEQ, 0, 94, 70, 72, 1013, 220, 56, 55, 0, L, 0, , 239, 1, FLORENCE, 20 +AL, 06, 2018091512, , BEST, 0, 336N, 795W, 55, 992, TS, 50, NEQ, 56, 94, 70, 72, 1013, 220, 56, 55, 0, L, 0, , 239, 1, FLORENCE, 20 AL, 06, 2018091518, , BEST, 0, 336N, 798W, 50, 997, TS, 34, NEQ, 135, 125, 164, 166, 1013, 220, 106, 50, 0, L, 0, , 270, 1, FLORENCE, 21 AL, 06, 2018091600, , BEST, 0, 336N, 802W, 45, 998, TS, 34, NEQ, 125, 125, 151, 155, 1013, 240, 106, 50, 0, L, 0, , 270, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 336N, 808W, 40, 999, TS, 34, NEQ, 125, 125, 113, 127, 1013, 260, 106, 40, 0, L, 0, , 270, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 336N, 815W, 35, 1002, TS, 34, NEQ, 140, 0, 0, 0, 1013, 280, 136, 40, 0, L, 0, , 270, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 341N, 821W, 30, 1006, TD, 0, , 0, 0, 0, 0, 1013, 300, 136, 40, 0, L, 0, , 315, 4, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 350N, 822W, 25, 1007, TD, 0, , 0, 0, 390, 0, 1013, 320, 146, 35, 0, L, 0, , 355, 5, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 341N, 821W, 30, 1006, TD, 0, , 0, 0, 404, 517, 1013, 300, 136, 40, 0, L, 0, , 315, 4, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 350N, 822W, 25, 1007, TD, 0, , 0, 0, 390, 523, 1013, 320, 146, 35, 0, L, 0, , 355, 5, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 364N, 826W, 25, 1008, TD, 0, , 0, 0, 305, 425, 1013, 340, 156, 35, 0, L, 0, , 347, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 378N, 822W, 25, 1008, EX, 0, , 0, 0, 302, 418, 1013, 360, 156, 30, 0, L, 0, , 13, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 388N, 820W, 25, 1008, EX, 0, , 0, 0, 334, 0, 1013, 360, 156, 30, 0, L, 0, , 9, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 388N, 820W, 25, 1008, EX, 0, , 0, 0, 334, 430, 1013, 360, 156, 30, 0, L, 0, , 9, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 395N, 805W, 25, 1008, EX, 0, , 0, 0, 304, 412, 1013, 360, 156, 0, 0, , 0, , 59, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 413N, 768W, 25, 1007, EX, 0, , 0, 0, 0, 311, 1013, 360, 166, 0, 0, , 0, , 56, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 422N, 733W, 25, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 176, 30, 0, L, 0, , 70, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_1.22 b/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_1.22 index bf8e5473..9685d96c 100644 --- a/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_1.22 +++ b/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_1.22 @@ -1,10 +1,10 @@ AL, 06, 2018091100, , BEST, 0, 257N, 618W, 119, 940, HU, 34, NEQ, 171, 171, 122, 172, 1010, 200, 14, 145, 0, L, 0, , 288, 7, FLORENCE, 1 AL, 06, 2018091100, , BEST, 0, 257N, 618W, 119, 940, HU, 50, NEQ, 84, 84, 71, 84, 1010, 200, 14, 145, 0, L, 0, , 288, 7, FLORENCE, 1 AL, 06, 2018091100, , BEST, 0, 257N, 618W, 119, 940, HU, 64, NEQ, 51, 43, 36, 51, 1010, 200, 14, 145, 0, L, 0, , 288, 7, FLORENCE, 1 -AL, 06, 2018091106, , BEST, 0, 261N, 632W, 119, 946, HU, 34, NEQ, 160, 161, 113, 173, 1010, 200, 19, 145, 0, L, 0, , 288, 7, FLORENCE, 2 +AL, 06, 2018091106, , BEST, 0, 261N, 632W, 119, 946, HU, 34, NEQ, 160, 160, 113, 173, 1010, 200, 19, 145, 0, L, 0, , 288, 7, FLORENCE, 2 AL, 06, 2018091106, , BEST, 0, 261N, 632W, 119, 946, HU, 50, NEQ, 77, 77, 65, 77, 1010, 200, 19, 145, 0, L, 0, , 288, 7, FLORENCE, 2 AL, 06, 2018091106, , BEST, 0, 261N, 632W, 119, 946, HU, 64, NEQ, 46, 39, 33, 46, 1010, 200, 19, 145, 0, L, 0, , 288, 7, FLORENCE, 2 -AL, 06, 2018091112, , BEST, 0, 266N, 647W, 129, 943, HU, 34, NEQ, 172, 160, 113, 149, 1010, 200, 19, 140, 0, L, 0, , 291, 7, FLORENCE, 3 +AL, 06, 2018091112, , BEST, 0, 266N, 647W, 129, 943, HU, 34, NEQ, 171, 160, 113, 149, 1010, 200, 19, 140, 0, L, 0, , 291, 7, FLORENCE, 3 AL, 06, 2018091112, , BEST, 0, 266N, 647W, 129, 943, HU, 50, NEQ, 89, 77, 65, 89, 1010, 200, 19, 140, 0, L, 0, , 291, 7, FLORENCE, 3 AL, 06, 2018091112, , BEST, 0, 266N, 647W, 129, 943, HU, 64, NEQ, 52, 45, 46, 52, 1010, 200, 19, 140, 0, L, 0, , 291, 7, FLORENCE, 3 AL, 06, 2018091118, , BEST, 0, 273N, 664W, 134, 933, HU, 34, NEQ, 195, 171, 135, 184, 1010, 200, 14, 145, 0, L, 0, , 295, 9, FLORENCE, 4 @@ -35,7 +35,7 @@ AL, 06, 2018091318, , BEST, 0, 337N, 760W, 93, 949, HU, 34, NEQ, 198, AL, 06, 2018091318, , BEST, 0, 337N, 760W, 93, 949, HU, 50, NEQ, 121, 109, 98, 98, 1011, 200, 24, 110, 0, L, 0, , 305, 5, FLORENCE, 12 AL, 06, 2018091318, , BEST, 0, 337N, 760W, 93, 949, HU, 64, NEQ, 87, 75, 64, 76, 1011, 200, 24, 110, 0, L, 0, , 305, 5, FLORENCE, 12 AL, 06, 2018091400, , BEST, 0, 341N, 765W, 93, 948, HU, 34, NEQ, 198, 176, 154, 119, 1012, 200, 24, 105, 0, L, 0, , 311, 3, FLORENCE, 13 -AL, 06, 2018091400, , BEST, 0, 341N, 765W, 93, 948, HU, 50, NEQ, 121, 97, 98, 86, 1012, 200, 24, 105, 0, L, 0, , 311, 3, FLORENCE, 13 +AL, 06, 2018091400, , BEST, 0, 341N, 765W, 93, 948, HU, 50, NEQ, 121, 97, 98, 85, 1012, 200, 24, 105, 0, L, 0, , 311, 3, FLORENCE, 13 AL, 06, 2018091400, , BEST, 0, 341N, 765W, 93, 948, HU, 64, NEQ, 87, 75, 63, 63, 1012, 200, 24, 105, 0, L, 0, , 311, 3, FLORENCE, 13 AL, 06, 2018091406, , BEST, 0, 343N, 773W, 88, 948, HU, 34, NEQ, 199, 176, 153, 119, 1012, 200, 24, 100, 0, L, 0, , 287, 3, FLORENCE, 14 AL, 06, 2018091406, , BEST, 0, 343N, 773W, 88, 948, HU, 50, NEQ, 121, 98, 98, 86, 1012, 200, 24, 100, 0, L, 0, , 287, 3, FLORENCE, 14 @@ -47,24 +47,24 @@ AL, 06, 2018091412, , BEST, 0, 341N, 780W, 83, 953, HU, 34, NEQ, 196, AL, 06, 2018091412, , BEST, 0, 341N, 780W, 83, 953, HU, 50, NEQ, 119, 96, 98, 48, 1012, 200, 29, 90, 0, L, 0, , 241, 5, FLORENCE, 16 AL, 06, 2018091412, , BEST, 0, 341N, 780W, 83, 953, HU, 64, NEQ, 74, 75, 88, 23, 1012, 200, 29, 90, 0, L, 0, , 241, 5, FLORENCE, 16 AL, 06, 2018091418, , BEST, 0, 340N, 785W, 68, 965, HU, 34, NEQ, 173, 151, 141, 82, 1012, 200, 34, 80, 0, L, 0, , 256, 2, FLORENCE, 17 -AL, 06, 2018091418, , BEST, 0, 340N, 785W, 68, 965, HU, 50, NEQ, 109, 85, 74, 0, 1012, 200, 34, 80, 0, L, 0, , 256, 2, FLORENCE, 17 +AL, 06, 2018091418, , BEST, 0, 340N, 785W, 68, 965, HU, 50, NEQ, 109, 85, 74, 34, 1012, 200, 34, 80, 0, L, 0, , 256, 2, FLORENCE, 17 AL, 06, 2018091418, , BEST, 0, 340N, 785W, 68, 965, HU, 64, NEQ, 51, 25, 0, 37, 1012, 200, 34, 80, 0, L, 0, , 256, 2, FLORENCE, 17 AL, 06, 2018091500, , BEST, 0, 339N, 789W, 63, 975, TS, 34, NEQ, 175, 176, 118, 70, 1013, 210, 34, 65, 0, L, 0, , 251, 2, FLORENCE, 18 -AL, 06, 2018091500, , BEST, 0, 339N, 789W, 63, 975, TS, 50, NEQ, 87, 88, 63, 0, 1013, 210, 34, 65, 0, L, 0, , 251, 2, FLORENCE, 18 -AL, 06, 2018091506, , BEST, 0, 337N, 794W, 58, 983, TS, 34, NEQ, 170, 171, 102, 0, 1013, 210, 54, 60, 0, L, 0, , 244, 2, FLORENCE, 19 +AL, 06, 2018091500, , BEST, 0, 339N, 789W, 63, 975, TS, 50, NEQ, 87, 88, 63, 34, 1013, 210, 34, 65, 0, L, 0, , 251, 2, FLORENCE, 18 +AL, 06, 2018091506, , BEST, 0, 337N, 794W, 58, 983, TS, 34, NEQ, 170, 171, 102, 54, 1013, 210, 54, 60, 0, L, 0, , 244, 2, FLORENCE, 19 AL, 06, 2018091506, , BEST, 0, 337N, 794W, 58, 983, TS, 50, NEQ, 83, 86, 72, 77, 1013, 210, 54, 60, 0, L, 0, , 244, 2, FLORENCE, 19 AL, 06, 2018091512, , BEST, 0, 337N, 796W, 58, 990, TS, 34, NEQ, 168, 145, 87, 42, 1013, 220, 64, 55, 0, L, 0, , 252, 1, FLORENCE, 20 -AL, 06, 2018091512, , BEST, 0, 337N, 796W, 58, 990, TS, 50, NEQ, 0, 123, 90, 91, 1013, 220, 64, 55, 0, L, 0, , 252, 1, FLORENCE, 20 +AL, 06, 2018091512, , BEST, 0, 337N, 796W, 58, 990, TS, 50, NEQ, 64, 123, 90, 91, 1013, 220, 64, 55, 0, L, 0, , 252, 1, FLORENCE, 20 AL, 06, 2018091518, , BEST, 0, 337N, 799W, 53, 995, TS, 34, NEQ, 149, 137, 184, 186, 1013, 220, 114, 50, 0, L, 0, , 273, 1, FLORENCE, 21 AL, 06, 2018091518, , BEST, 0, 337N, 799W, 53, 995, TS, 50, NEQ, 134, 100, 118, 124, 1013, 220, 114, 50, 0, L, 0, , 273, 1, FLORENCE, 21 AL, 06, 2018091600, , BEST, 0, 337N, 804W, 47, 997, TS, 34, NEQ, 137, 137, 166, 170, 1013, 240, 114, 50, 0, L, 0, , 275, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 337N, 810W, 42, 998, TS, 34, NEQ, 139, 140, 140, 150, 1013, 260, 114, 40, 0, L, 0, , 270, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 338N, 816W, 37, 1000, TS, 34, NEQ, 175, 128, 0, 0, 1013, 280, 144, 40, 0, L, 0, , 280, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 343N, 820W, 32, 1005, TD, 0, , 0, 0, 0, 0, 1013, 300, 144, 40, 0, L, 0, , 323, 3, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 351N, 821W, 27, 1006, TD, 0, , 0, 0, 446, 0, 1013, 320, 154, 35, 0, L, 0, , 354, 4, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 343N, 820W, 32, 1005, TD, 0, , 0, 0, 474, 606, 1013, 300, 144, 40, 0, L, 0, , 323, 3, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 351N, 821W, 27, 1006, TD, 0, , 0, 0, 446, 598, 1013, 320, 154, 35, 0, L, 0, , 354, 4, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 365N, 824W, 27, 1007, TD, 0, , 0, 0, 355, 494, 1013, 340, 164, 35, 0, L, 0, , 349, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 379N, 820W, 27, 1007, EX, 0, , 0, 0, 348, 481, 1013, 360, 164, 30, 0, L, 0, , 13, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 388N, 817W, 27, 1007, EX, 0, , 0, 0, 392, 0, 1013, 360, 164, 30, 0, L, 0, , 15, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 388N, 817W, 27, 1007, EX, 0, , 0, 0, 392, 506, 1013, 360, 164, 30, 0, L, 0, , 15, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 395N, 803W, 27, 1007, EX, 0, , 0, 0, 353, 479, 1013, 360, 164, 0, 0, , 0, , 59, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 413N, 766W, 27, 1007, EX, 0, , 0, 0, 0, 322, 1013, 360, 174, 0, 0, , 0, , 57, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 421N, 731W, 27, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 184, 30, 0, L, 0, , 70, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_2.22 b/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_2.22 index cce74da5..785faf66 100644 --- a/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_2.22 +++ b/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_2.22 @@ -47,24 +47,24 @@ AL, 06, 2018091412, , BEST, 0, 341N, 778W, 81, 955, HU, 34, NEQ, 180, AL, 06, 2018091412, , BEST, 0, 341N, 778W, 81, 955, HU, 50, NEQ, 108, 87, 91, 44, 1012, 200, 27, 90, 0, L, 0, , 242, 5, FLORENCE, 16 AL, 06, 2018091412, , BEST, 0, 341N, 778W, 81, 955, HU, 64, NEQ, 66, 67, 78, 21, 1012, 200, 27, 90, 0, L, 0, , 242, 5, FLORENCE, 16 AL, 06, 2018091418, , BEST, 0, 340N, 783W, 66, 968, HU, 34, NEQ, 159, 138, 128, 75, 1012, 200, 32, 80, 0, L, 0, , 252, 2, FLORENCE, 17 -AL, 06, 2018091418, , BEST, 0, 340N, 783W, 66, 968, HU, 50, NEQ, 97, 76, 65, 0, 1012, 200, 32, 80, 0, L, 0, , 252, 2, FLORENCE, 17 -AL, 06, 2018091418, , BEST, 0, 340N, 783W, 66, 968, HU, 64, NEQ, 40, 30, 0, 0, 1012, 200, 32, 80, 0, L, 0, , 252, 2, FLORENCE, 17 +AL, 06, 2018091418, , BEST, 0, 340N, 783W, 66, 968, HU, 50, NEQ, 97, 76, 65, 32, 1012, 200, 32, 80, 0, L, 0, , 252, 2, FLORENCE, 17 +AL, 06, 2018091418, , BEST, 0, 340N, 783W, 66, 968, HU, 64, NEQ, 40, 31, 0, 0, 1012, 200, 32, 80, 0, L, 0, , 252, 2, FLORENCE, 17 AL, 06, 2018091500, , BEST, 0, 339N, 787W, 61, 977, TS, 34, NEQ, 159, 159, 107, 64, 1013, 210, 32, 65, 0, L, 0, , 254, 2, FLORENCE, 18 -AL, 06, 2018091500, , BEST, 0, 339N, 787W, 61, 977, TS, 50, NEQ, 76, 76, 55, 0, 1013, 210, 32, 65, 0, L, 0, , 254, 2, FLORENCE, 18 -AL, 06, 2018091506, , BEST, 0, 337N, 792W, 56, 985, TS, 34, NEQ, 157, 157, 95, 0, 1013, 210, 52, 60, 0, L, 0, , 246, 2, FLORENCE, 19 +AL, 06, 2018091500, , BEST, 0, 339N, 787W, 61, 977, TS, 50, NEQ, 76, 76, 55, 32, 1013, 210, 32, 65, 0, L, 0, , 254, 2, FLORENCE, 18 +AL, 06, 2018091506, , BEST, 0, 337N, 792W, 56, 985, TS, 34, NEQ, 157, 157, 95, 52, 1013, 210, 52, 60, 0, L, 0, , 246, 2, FLORENCE, 19 AL, 06, 2018091506, , BEST, 0, 337N, 792W, 56, 985, TS, 50, NEQ, 75, 75, 58, 66, 1013, 210, 52, 60, 0, L, 0, , 246, 2, FLORENCE, 19 AL, 06, 2018091512, , BEST, 0, 336N, 794W, 56, 991, TS, 34, NEQ, 156, 135, 83, 41, 1013, 220, 62, 55, 0, L, 0, , 241, 1, FLORENCE, 20 -AL, 06, 2018091512, , BEST, 0, 336N, 794W, 56, 991, TS, 50, NEQ, 0, 107, 80, 82, 1013, 220, 62, 55, 0, L, 0, , 241, 1, FLORENCE, 20 +AL, 06, 2018091512, , BEST, 0, 336N, 794W, 56, 991, TS, 50, NEQ, 62, 107, 80, 82, 1013, 220, 62, 55, 0, L, 0, , 241, 1, FLORENCE, 20 AL, 06, 2018091518, , BEST, 0, 336N, 797W, 51, 997, TS, 34, NEQ, 143, 133, 174, 176, 1013, 220, 112, 50, 0, L, 0, , 263, 1, FLORENCE, 21 AL, 06, 2018091518, , BEST, 0, 336N, 797W, 51, 997, TS, 50, NEQ, 118, 0, 0, 0, 1013, 220, 112, 50, 0, L, 0, , 263, 1, FLORENCE, 21 AL, 06, 2018091600, , BEST, 0, 336N, 801W, 45, 997, TS, 34, NEQ, 133, 133, 162, 166, 1013, 240, 112, 50, 0, L, 0, , 269, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 336N, 807W, 40, 999, TS, 34, NEQ, 133, 134, 126, 138, 1013, 260, 112, 40, 0, L, 0, , 270, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 336N, 814W, 35, 1002, TS, 34, NEQ, 156, 0, 0, 0, 1013, 280, 142, 40, 0, L, 0, , 270, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 340N, 820W, 30, 1006, TD, 0, , 0, 0, 0, 0, 1013, 300, 142, 40, 0, L, 0, , 309, 4, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 349N, 822W, 25, 1007, TD, 0, , 0, 0, 412, 0, 1013, 320, 152, 35, 0, L, 0, , 351, 5, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 340N, 820W, 30, 1006, TD, 0, , 0, 0, 421, 538, 1013, 300, 142, 40, 0, L, 0, , 309, 4, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 349N, 822W, 25, 1007, TD, 0, , 0, 0, 412, 550, 1013, 320, 152, 35, 0, L, 0, , 351, 5, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 363N, 826W, 25, 1008, TD, 0, , 0, 0, 320, 445, 1013, 340, 162, 35, 0, L, 0, , 348, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 377N, 823W, 25, 1008, EX, 0, , 0, 0, 318, 439, 1013, 360, 162, 30, 0, L, 0, , 11, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 387N, 820W, 25, 1008, EX, 0, , 0, 0, 347, 0, 1013, 360, 162, 30, 0, L, 0, , 9, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 387N, 820W, 25, 1008, EX, 0, , 0, 0, 347, 445, 1013, 360, 162, 30, 0, L, 0, , 9, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 395N, 806W, 25, 1008, EX, 0, , 0, 0, 323, 437, 1013, 360, 162, 0, 0, , 0, , 55, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 413N, 769W, 25, 1007, EX, 0, , 0, 0, 0, 318, 1013, 360, 172, 0, 0, , 0, , 56, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 422N, 734W, 25, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 182, 30, 0, L, 0, , 69, 14, FLORENCE, 32 diff --git a/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_3.22 b/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_3.22 index 63b0ed30..7e2f343e 100644 --- a/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_3.22 +++ b/tests/data/reference/test_multivariate_besttrack_ensemble/vortex_4_variable_perturbation_3.22 @@ -1,7 +1,7 @@ AL, 06, 2018091100, , BEST, 0, 256N, 618W, 112, 947, HU, 34, NEQ, 96, 96, 64, 96, 1010, 200, 7, 145, 0, L, 0, , 288, 7, FLORENCE, 1 AL, 06, 2018091100, , BEST, 0, 256N, 618W, 112, 947, HU, 50, NEQ, 42, 42, 34, 41, 1010, 200, 7, 145, 0, L, 0, , 288, 7, FLORENCE, 1 AL, 06, 2018091100, , BEST, 0, 256N, 618W, 112, 947, HU, 64, NEQ, 24, 20, 17, 24, 1010, 200, 7, 145, 0, L, 0, , 288, 7, FLORENCE, 1 -AL, 06, 2018091106, , BEST, 0, 260N, 632W, 112, 953, HU, 34, NEQ, 107, 106, 72, 114, 1010, 200, 12, 145, 0, L, 0, , 288, 7, FLORENCE, 2 +AL, 06, 2018091106, , BEST, 0, 260N, 632W, 112, 953, HU, 34, NEQ, 106, 106, 72, 114, 1010, 200, 12, 145, 0, L, 0, , 288, 7, FLORENCE, 2 AL, 06, 2018091106, , BEST, 0, 260N, 632W, 112, 953, HU, 50, NEQ, 47, 47, 39, 47, 1010, 200, 12, 145, 0, L, 0, , 288, 7, FLORENCE, 2 AL, 06, 2018091106, , BEST, 0, 260N, 632W, 112, 953, HU, 64, NEQ, 27, 23, 19, 27, 1010, 200, 12, 145, 0, L, 0, , 288, 7, FLORENCE, 2 AL, 06, 2018091112, , BEST, 0, 265N, 647W, 122, 950, HU, 34, NEQ, 115, 106, 72, 98, 1010, 200, 12, 140, 0, L, 0, , 291, 7, FLORENCE, 3 @@ -47,22 +47,22 @@ AL, 06, 2018091412, , BEST, 0, 341N, 778W, 78, 959, HU, 34, NEQ, 150, AL, 06, 2018091412, , BEST, 0, 341N, 778W, 78, 959, HU, 50, NEQ, 86, 69, 71, 35, 1012, 200, 22, 90, 0, L, 0, , 242, 5, FLORENCE, 16 AL, 06, 2018091412, , BEST, 0, 341N, 778W, 78, 959, HU, 64, NEQ, 50, 50, 51, 18, 1012, 200, 22, 90, 0, L, 0, , 242, 5, FLORENCE, 16 AL, 06, 2018091418, , BEST, 0, 340N, 783W, 63, 972, HU, 34, NEQ, 133, 115, 105, 62, 1012, 200, 27, 80, 0, L, 0, , 252, 2, FLORENCE, 17 -AL, 06, 2018091418, , BEST, 0, 340N, 783W, 63, 972, HU, 50, NEQ, 76, 59, 50, 0, 1012, 200, 27, 80, 0, L, 0, , 252, 2, FLORENCE, 17 +AL, 06, 2018091418, , BEST, 0, 340N, 783W, 63, 972, HU, 50, NEQ, 76, 59, 50, 27, 1012, 200, 27, 80, 0, L, 0, , 252, 2, FLORENCE, 17 AL, 06, 2018091500, , BEST, 0, 339N, 787W, 58, 980, TS, 34, NEQ, 132, 131, 87, 53, 1013, 210, 27, 65, 0, L, 0, , 254, 2, FLORENCE, 18 -AL, 06, 2018091500, , BEST, 0, 339N, 787W, 58, 980, TS, 50, NEQ, 58, 57, 41, 0, 1013, 210, 27, 65, 0, L, 0, , 254, 2, FLORENCE, 18 -AL, 06, 2018091506, , BEST, 0, 337N, 792W, 53, 988, TS, 34, NEQ, 135, 135, 82, 0, 1013, 210, 47, 60, 0, L, 0, , 246, 2, FLORENCE, 19 +AL, 06, 2018091500, , BEST, 0, 339N, 787W, 58, 980, TS, 50, NEQ, 58, 57, 41, 27, 1013, 210, 27, 65, 0, L, 0, , 254, 2, FLORENCE, 18 +AL, 06, 2018091506, , BEST, 0, 337N, 792W, 53, 988, TS, 34, NEQ, 135, 135, 82, 47, 1013, 210, 47, 60, 0, L, 0, , 246, 2, FLORENCE, 19 AL, 06, 2018091506, , BEST, 0, 337N, 792W, 53, 988, TS, 50, NEQ, 60, 57, 0, 0, 1013, 210, 47, 60, 0, L, 0, , 246, 2, FLORENCE, 19 AL, 06, 2018091512, , BEST, 0, 336N, 794W, 53, 994, TS, 34, NEQ, 137, 119, 75, 38, 1013, 220, 57, 55, 0, L, 0, , 241, 1, FLORENCE, 20 -AL, 06, 2018091512, , BEST, 0, 336N, 794W, 53, 994, TS, 50, NEQ, 0, 81, 63, 65, 1013, 220, 57, 55, 0, L, 0, , 241, 1, FLORENCE, 20 +AL, 06, 2018091512, , BEST, 0, 336N, 794W, 53, 994, TS, 50, NEQ, 57, 81, 63, 65, 1013, 220, 57, 55, 0, L, 0, , 241, 1, FLORENCE, 20 AL, 06, 2018091518, , BEST, 0, 336N, 797W, 48, 998, TS, 34, NEQ, 134, 125, 158, 160, 1013, 220, 107, 50, 0, L, 0, , 263, 1, FLORENCE, 21 AL, 06, 2018091600, , BEST, 0, 335N, 801W, 44, 999, TS, 34, NEQ, 125, 125, 148, 152, 1013, 240, 107, 50, 0, L, 0, , 266, 2, FLORENCE, 22 AL, 06, 2018091606, , BEST, 0, 335N, 807W, 39, 1000, TS, 34, NEQ, 123, 122, 0, 113, 1013, 260, 107, 40, 0, L, 0, , 269, 3, FLORENCE, 23 AL, 06, 2018091612, , BEST, 0, 335N, 814W, 34, 1003, TS, 34, NEQ, 0, 0, 0, 0, 1013, 280, 137, 40, 0, L, 0, , 271, 3, FLORENCE, 24 -AL, 06, 2018091618, , BEST, 0, 340N, 821W, 29, 1007, TD, 0, , 0, 0, 0, 0, 1013, 300, 137, 40, 0, L, 0, , 310, 4, FLORENCE, 25 -AL, 06, 2018091700, , BEST, 0, 349N, 823W, 24, 1008, TD, 0, , 0, 0, 366, 0, 1013, 320, 147, 35, 0, L, 0, , 350, 5, FLORENCE, 26 +AL, 06, 2018091618, , BEST, 0, 340N, 821W, 29, 1007, TD, 0, , 0, 0, 378, 482, 1013, 300, 137, 40, 0, L, 0, , 310, 4, FLORENCE, 25 +AL, 06, 2018091700, , BEST, 0, 349N, 823W, 24, 1008, TD, 0, , 0, 0, 366, 486, 1013, 320, 147, 35, 0, L, 0, , 350, 5, FLORENCE, 26 AL, 06, 2018091706, , BEST, 0, 363N, 827W, 24, 1009, TD, 0, , 0, 0, 281, 388, 1013, 340, 157, 35, 0, L, 0, , 348, 7, FLORENCE, 27 AL, 06, 2018091712, , BEST, 0, 377N, 823W, 24, 1009, EX, 0, , 0, 0, 279, 383, 1013, 360, 157, 30, 0, L, 0, , 11, 7, FLORENCE, 28 -AL, 06, 2018091718, , BEST, 0, 387N, 821W, 24, 1009, EX, 0, , 0, 0, 309, 0, 1013, 360, 157, 30, 0, L, 0, , 10, 5, FLORENCE, 29 +AL, 06, 2018091718, , BEST, 0, 387N, 821W, 24, 1009, EX, 0, , 0, 0, 309, 395, 1013, 360, 157, 30, 0, L, 0, , 10, 5, FLORENCE, 29 AL, 06, 2018091800, , BEST, 0, 395N, 807W, 24, 1009, EX, 0, , 0, 0, 283, 381, 1013, 360, 157, 0, 0, , 0, , 55, 7, FLORENCE, 30 AL, 06, 2018091806, , BEST, 0, 413N, 770W, 24, 1007, EX, 0, , 0, 0, 0, 312, 1013, 360, 167, 0, 0, , 0, , 56, 17, FLORENCE, 31 AL, 06, 2018091812, , BEST, 0, 422N, 735W, 24, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 177, 30, 0, L, 0, , 69, 14, FLORENCE, 32