Skip to content

Commit

Permalink
Fix cross track point perturbation (#122)
Browse files Browse the repository at this point in the history 
* Fix cross track point perturbation

* Update tests after track fix

* Remove unnessary abs
  • Loading branch information
@SorooshMani-NOAA
SorooshMani-NOAA authored Dec 4, 2023
1 parent eede830 commit 1fbaf14
Show file tree
Hide file tree
Showing 14 changed files with 405 additions and 405 deletions.
6 changes: 3 additions & 3 deletions ensembleperturbation/perturbation/atcf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ def perturb(
next_offset = get_offset(current_point, next_point, cross_track_error)

# get the perpendicular offset based on the average of the forward and backward piecewise track lines adjusted so that the distance matches the actual cross_error
normal_offset = numpy.mean([previous_offset, next_offset])
normal_offset = numpy.mean([previous_offset, next_offset], axis=0)
alpha = abs(cross_track_error) / numpy.sqrt(numpy.sum(normal_offset ** 2))

if numpy.isinf(alpha):
Expand Down Expand Up @@ -1796,9 +1796,9 @@ def get_offset(
# z**2 / (1 + pslope**2) = x**2
# z / (1 + pslope**2)**0.5 = x

points = numpy.concatenate([point_1, point_2], axis=0)
points = numpy.vstack([point_1, point_2])

difference = numpy.diff(points, axis=0)
difference = numpy.diff(points, axis=0).ravel()

# tangential slope approximation
slope = difference[1] / difference[0]
Expand Down
44 changes: 22 additions & 22 deletions tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_1.22
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
AL, 06, 2018091218, , OFCL, 0, 303N, 719W, 106, 949, HU, 34, NEQ, 175, 145, 105, 145, 1013, 0, 20,,, ,, , 0, 0, , 1
AL, 06, 2018091218, , OFCL, 0, 303N, 719W, 106, 949, HU, 50, NEQ, 105, 85, 65, 85, 1013, 0, 20,,, ,, , 0, 0, , 1
AL, 06, 2018091218, , OFCL, 0, 303N, 719W, 106, 949, HU, 64, NEQ, 65, 65, 45, 65, 1013, 0, 20,,, ,, , 0, 0, , 1
AL, 06, 2018091218, , OFCL, 3, 308N, 726W, 98, 957, HU, 34, NEQ, 175, 145, 105, 145, 1013, 0, 20,,, ,, , 310, 7, , 2
AL, 06, 2018091218, , OFCL, 3, 308N, 726W, 98, 957, HU, 50, NEQ, 105, 85, 65, 85, 1013, 0, 20,,, ,, , 310, 7, , 2
AL, 06, 2018091218, , OFCL, 3, 308N, 726W, 98, 957, HU, 64, NEQ, 65, 65, 45, 65, 1013, 0, 20,,, ,, , 310, 7, , 2
AL, 06, 2018091218, , OFCL, 12, 318N, 743W, 97, 959, HU, 34, NEQ, 177, 147, 107, 147, 1013, 0, 22,,, ,, , 306, 6, , 3
AL, 06, 2018091218, , OFCL, 12, 318N, 743W, 97, 959, HU, 50, NEQ, 107, 87, 67, 87, 1013, 0, 22,,, ,, , 306, 6, , 3
AL, 06, 2018091218, , OFCL, 12, 318N, 743W, 97, 959, HU, 64, NEQ, 67, 67, 47, 67, 1013, 0, 22,,, ,, , 306, 6, , 3
AL, 06, 2018091218, , OFCL, 24, 330N, 761W, 91, 966, HU, 34, NEQ, 179, 149, 109, 149, 1013, 0, 24,,, ,, , 306, 5, , 4
AL, 06, 2018091218, , OFCL, 24, 330N, 761W, 91, 966, HU, 50, NEQ, 109, 89, 69, 89, 1013, 0, 24,,, ,, , 306, 5, , 4
AL, 06, 2018091218, , OFCL, 24, 330N, 761W, 91, 966, HU, 64, NEQ, 69, 69, 49, 69, 1013, 0, 24,,, ,, , 306, 5, , 4
AL, 06, 2018091218, , OFCL, 36, 333N, 774W, 84, 973, HU, 34, NEQ, 183, 153, 113, 153, 1013, 0, 28,,, ,, , 290, 3, , 5
AL, 06, 2018091218, , OFCL, 36, 333N, 774W, 84, 973, HU, 50, NEQ, 113, 93, 73, 93, 1013, 0, 28,,, ,, , 290, 3, , 5
AL, 06, 2018091218, , OFCL, 36, 333N, 774W, 84, 973, HU, 64, NEQ, 73, 73, 53, 73, 1013, 0, 28,,, ,, , 290, 3, , 5
AL, 06, 2018091218, , OFCL, 48, 334N, 782W, 80, 977, HU, 34, NEQ, 186, 156, 116, 136, 1013, 0, 31,,, ,, , 272, 2, , 6
AL, 06, 2018091218, , OFCL, 48, 334N, 782W, 80, 977, HU, 50, NEQ, 116, 96, 76, 76, 1013, 0, 31,,, ,, , 272, 2, , 6
AL, 06, 2018091218, , OFCL, 48, 334N, 782W, 80, 977, HU, 64, NEQ, 76, 76, 56, 56, 1013, 0, 31,,, ,, , 272, 2, , 6
AL, 06, 2018091218, , OFCL, 72, 328N, 799W, 48, 1000, HU, 34, NEQ, 182, 152, 82, 82, 1013, 0, 27,,, ,, , 248, 2, , 7
AL, 06, 2018091218, , OFCL, 72, 328N, 799W, 48, 1000, HU, 50, NEQ, 92, 92, 52, 52, 1013, 0, 27,,, ,, , 248, 2, , 7
AL, 06, 2018091218, , OFCL, 96, 324N, 827W, 15, 1012, TD, 34, NEQ, 0, 0, 0, 0, 1013, 0, 29,,, ,, , 262, 3, , 8
AL, 06, 2018091218, , OFCL, 120, 330N, 849W, 15, 1012, LO, 34, NEQ, 0, 0, 0, 0, 1013, 0, 33,,, ,, , 287, 3, , 9
AL, 06, 2018091218, , OFCL, 0, 304N, 718W, 106, 949, HU, 34, NEQ, 175, 145, 105, 145, 1013, 0, 20,,, ,, , 0, 0, , 1
AL, 06, 2018091218, , OFCL, 0, 304N, 718W, 106, 949, HU, 50, NEQ, 105, 85, 65, 85, 1013, 0, 20,,, ,, , 0, 0, , 1
AL, 06, 2018091218, , OFCL, 0, 304N, 718W, 106, 949, HU, 64, NEQ, 65, 65, 45, 65, 1013, 0, 20,,, ,, , 0, 0, , 1
AL, 06, 2018091218, , OFCL, 3, 309N, 724W, 98, 957, HU, 34, NEQ, 175, 145, 105, 145, 1013, 0, 20,,, ,, , 317, 7, , 2
AL, 06, 2018091218, , OFCL, 3, 309N, 724W, 98, 957, HU, 50, NEQ, 105, 85, 65, 85, 1013, 0, 20,,, ,, , 317, 7, , 2
AL, 06, 2018091218, , OFCL, 3, 309N, 724W, 98, 957, HU, 64, NEQ, 65, 65, 45, 65, 1013, 0, 20,,, ,, , 317, 7, , 2
AL, 06, 2018091218, , OFCL, 12, 322N, 739W, 97, 959, HU, 34, NEQ, 177, 147, 107, 147, 1013, 0, 22,,, ,, , 315, 6, , 3
AL, 06, 2018091218, , OFCL, 12, 322N, 739W, 97, 959, HU, 50, NEQ, 107, 87, 67, 87, 1013, 0, 22,,, ,, , 315, 6, , 3
AL, 06, 2018091218, , OFCL, 12, 322N, 739W, 97, 959, HU, 64, NEQ, 67, 67, 47, 67, 1013, 0, 22,,, ,, , 315, 6, , 3
AL, 06, 2018091218, , OFCL, 24, 336N, 755W, 91, 966, HU, 34, NEQ, 179, 149, 109, 149, 1013, 0, 24,,, ,, , 315, 5, , 4
AL, 06, 2018091218, , OFCL, 24, 336N, 755W, 91, 966, HU, 50, NEQ, 109, 89, 69, 89, 1013, 0, 24,,, ,, , 315, 5, , 4
AL, 06, 2018091218, , OFCL, 24, 336N, 755W, 91, 966, HU, 64, NEQ, 69, 69, 49, 69, 1013, 0, 24,,, ,, , 315, 5, , 4
AL, 06, 2018091218, , OFCL, 36, 342N, 767W, 84, 973, HU, 34, NEQ, 183, 153, 113, 153, 1013, 0, 28,,, ,, , 305, 3, , 5
AL, 06, 2018091218, , OFCL, 36, 342N, 767W, 84, 973, HU, 50, NEQ, 113, 93, 73, 93, 1013, 0, 28,,, ,, , 305, 3, , 5
AL, 06, 2018091218, , OFCL, 36, 342N, 767W, 84, 973, HU, 64, NEQ, 73, 73, 53, 73, 1013, 0, 28,,, ,, , 305, 3, , 5
AL, 06, 2018091218, , OFCL, 48, 345N, 776W, 80, 977, HU, 34, NEQ, 186, 156, 116, 136, 1013, 0, 31,,, ,, , 294, 2, , 6
AL, 06, 2018091218, , OFCL, 48, 345N, 776W, 80, 977, HU, 50, NEQ, 116, 96, 76, 76, 1013, 0, 31,,, ,, , 294, 2, , 6
AL, 06, 2018091218, , OFCL, 48, 345N, 776W, 80, 977, HU, 64, NEQ, 76, 76, 56, 56, 1013, 0, 31,,, ,, , 294, 2, , 6
AL, 06, 2018091218, , OFCL, 72, 347N, 786W, 48, 1000, HU, 34, NEQ, 182, 152, 82, 82, 1013, 0, 27,,, ,, , 279, 1, , 7
AL, 06, 2018091218, , OFCL, 72, 347N, 786W, 48, 1000, HU, 50, NEQ, 92, 92, 52, 52, 1013, 0, 27,,, ,, , 279, 1, , 7
AL, 06, 2018091218, , OFCL, 96, 350N, 799W, 15, 1012, TD, 34, NEQ, 0, 0, 0, 0, 1013, 0, 29,,, ,, , 288, 1, , 8
AL, 06, 2018091218, , OFCL, 120, 361N, 810W, 15, 1012, LO, 34, NEQ, 0, 0, 0, 0, 1013, 0, 33,,, ,, , 322, 2, , 9
38 changes: 19 additions & 19 deletions tests/data/reference/test_existing_advisory/vortex_4_variable_korobov_2.22
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
AL, 06, 2018091218, , OFCL, 0, 304N, 719W, 107, 947, HU, 34, NEQ, 172, 142, 102, 142, 1013, 0, 17,,, ,, , 0, 0, , 1
AL, 06, 2018091218, , OFCL, 0, 304N, 719W, 107, 947, HU, 50, NEQ, 102, 82, 62, 82, 1013, 0, 17,,, ,, , 0, 0, , 1
AL, 06, 2018091218, , OFCL, 0, 304N, 719W, 107, 947, HU, 64, NEQ, 62, 62, 42, 62, 1013, 0, 17,,, ,, , 0, 0, , 1
AL, 06, 2018091218, , OFCL, 3, 309N, 726W, 101, 955, HU, 34, NEQ, 172, 142, 102, 142, 1013, 0, 17,,, ,, , 311, 8, , 2
AL, 06, 2018091218, , OFCL, 3, 309N, 726W, 101, 955, HU, 50, NEQ, 102, 82, 62, 82, 1013, 0, 17,,, ,, , 311, 8, , 2
AL, 06, 2018091218, , OFCL, 3, 309N, 726W, 101, 955, HU, 64, NEQ, 62, 62, 42, 62, 1013, 0, 17,,, ,, , 311, 8, , 2
AL, 06, 2018091218, , OFCL, 12, 320N, 743W, 102, 954, HU, 34, NEQ, 172, 142, 102, 142, 1013, 0, 17,,, ,, , 308, 6, , 3
AL, 06, 2018091218, , OFCL, 12, 320N, 743W, 102, 954, HU, 50, NEQ, 102, 82, 62, 82, 1013, 0, 17,,, ,, , 308, 6, , 3
AL, 06, 2018091218, , OFCL, 12, 320N, 743W, 102, 954, HU, 64, NEQ, 62, 62, 42, 62, 1013, 0, 17,,, ,, , 308, 6, , 3
AL, 06, 2018091218, , OFCL, 24, 332N, 762W, 98, 958, HU, 34, NEQ, 171, 141, 101, 141, 1013, 0, 16,,, ,, , 307, 5, , 4
AL, 06, 2018091218, , OFCL, 24, 332N, 762W, 98, 958, HU, 50, NEQ, 101, 81, 61, 81, 1013, 0, 16,,, ,, , 307, 5, , 4
AL, 06, 2018091218, , OFCL, 24, 332N, 762W, 98, 958, HU, 64, NEQ, 61, 61, 41, 61, 1013, 0, 16,,, ,, , 307, 5, , 4
AL, 06, 2018091218, , OFCL, 36, 336N, 776W, 91, 965, HU, 34, NEQ, 174, 144, 104, 144, 1013, 0, 19,,, ,, , 288, 3, , 5
AL, 06, 2018091218, , OFCL, 36, 336N, 776W, 91, 965, HU, 50, NEQ, 104, 84, 64, 84, 1013, 0, 19,,, ,, , 288, 3, , 5
AL, 06, 2018091218, , OFCL, 36, 336N, 776W, 91, 965, HU, 64, NEQ, 64, 64, 44, 64, 1013, 0, 19,,, ,, , 288, 3, , 5
AL, 06, 2018091218, , OFCL, 48, 335N, 786W, 87, 970, HU, 34, NEQ, 175, 145, 105, 125, 1013, 0, 20,,, ,, , 263, 2, , 6
AL, 06, 2018091218, , OFCL, 48, 335N, 786W, 87, 970, HU, 50, NEQ, 105, 85, 65, 65, 1013, 0, 20,,, ,, , 263, 2, , 6
AL, 06, 2018091218, , OFCL, 48, 335N, 786W, 87, 970, HU, 64, NEQ, 65, 65, 45, 45, 1013, 0, 20,,, ,, , 263, 2, , 6
AL, 06, 2018091218, , OFCL, 72, 329N, 804W, 56, 995, HU, 34, NEQ, 173, 143, 73, 73, 1013, 0, 18,,, ,, , 249, 2, , 7
AL, 06, 2018091218, , OFCL, 72, 329N, 804W, 56, 995, HU, 50, NEQ, 83, 83, 43, 43, 1013, 0, 18,,, ,, , 249, 2, , 7
AL, 06, 2018091218, , OFCL, 96, 331N, 833W, 16, 1012, TD, 34, NEQ, 0, 0, 0, 0, 1013, 0, 18,,, ,, , 276, 3, , 8
AL, 06, 2018091218, , OFCL, 120, 344N, 855W, 15, 1012, LO, 34, NEQ, 0, 0, 0, 0, 1013, 0, 21,,, ,, , 306, 3, , 9
AL, 06, 2018091218, , OFCL, 3, 310N, 725W, 101, 955, HU, 34, NEQ, 172, 142, 102, 142, 1013, 0, 17,,, ,, , 316, 7, , 2
AL, 06, 2018091218, , OFCL, 3, 310N, 725W, 101, 955, HU, 50, NEQ, 102, 82, 62, 82, 1013, 0, 17,,, ,, , 316, 7, , 2
AL, 06, 2018091218, , OFCL, 3, 310N, 725W, 101, 955, HU, 64, NEQ, 62, 62, 42, 62, 1013, 0, 17,,, ,, , 316, 7, , 2
AL, 06, 2018091218, , OFCL, 12, 322N, 740W, 102, 954, HU, 34, NEQ, 172, 142, 102, 142, 1013, 0, 17,,, ,, , 314, 6, , 3
AL, 06, 2018091218, , OFCL, 12, 322N, 740W, 102, 954, HU, 50, NEQ, 102, 82, 62, 82, 1013, 0, 17,,, ,, , 314, 6, , 3
AL, 06, 2018091218, , OFCL, 12, 322N, 740W, 102, 954, HU, 64, NEQ, 62, 62, 42, 62, 1013, 0, 17,,, ,, , 314, 6, , 3
AL, 06, 2018091218, , OFCL, 24, 336N, 758W, 98, 958, HU, 34, NEQ, 171, 141, 101, 141, 1013, 0, 16,,, ,, , 313, 5, , 4
AL, 06, 2018091218, , OFCL, 24, 336N, 758W, 98, 958, HU, 50, NEQ, 101, 81, 61, 81, 1013, 0, 16,,, ,, , 313, 5, , 4
AL, 06, 2018091218, , OFCL, 24, 336N, 758W, 98, 958, HU, 64, NEQ, 61, 61, 41, 61, 1013, 0, 16,,, ,, , 313, 5, , 4
AL, 06, 2018091218, , OFCL, 36, 342N, 771W, 91, 965, HU, 34, NEQ, 174, 144, 104, 144, 1013, 0, 19,,, ,, , 300, 3, , 5
AL, 06, 2018091218, , OFCL, 36, 342N, 771W, 91, 965, HU, 50, NEQ, 104, 84, 64, 84, 1013, 0, 19,,, ,, , 300, 3, , 5
AL, 06, 2018091218, , OFCL, 36, 342N, 771W, 91, 965, HU, 64, NEQ, 64, 64, 44, 64, 1013, 0, 19,,, ,, , 300, 3, , 5
AL, 06, 2018091218, , OFCL, 48, 344N, 782W, 87, 970, HU, 34, NEQ, 175, 145, 105, 125, 1013, 0, 20,,, ,, , 282, 2, , 6
AL, 06, 2018091218, , OFCL, 48, 344N, 782W, 87, 970, HU, 50, NEQ, 105, 85, 65, 65, 1013, 0, 20,,, ,, , 282, 2, , 6
AL, 06, 2018091218, , OFCL, 48, 344N, 782W, 87, 970, HU, 64, NEQ, 65, 65, 45, 45, 1013, 0, 20,,, ,, , 282, 2, , 6
AL, 06, 2018091218, , OFCL, 72, 344N, 796W, 56, 995, HU, 34, NEQ, 173, 143, 73, 73, 1013, 0, 18,,, ,, , 270, 1, , 7
AL, 06, 2018091218, , OFCL, 72, 344N, 796W, 56, 995, HU, 50, NEQ, 83, 83, 43, 43, 1013, 0, 18,,, ,, , 270, 1, , 7
AL, 06, 2018091218, , OFCL, 96, 353N, 813W, 16, 1012, TD, 34, NEQ, 0, 0, 0, 0, 1013, 0, 18,,, ,, , 301, 2, , 8
AL, 06, 2018091218, , OFCL, 120, 369N, 823W, 15, 1012, LO, 34, NEQ, 0, 0, 0, 0, 1013, 0, 21,,, ,, , 333, 2, , 9
Loading

0 comments on commit 1fbaf14

Please sign in to comment.