diff --git a/adcircpy/forcing/winds/best_track.py b/adcircpy/forcing/winds/best_track.py index 85cfba8a..444b3be7 100644 --- a/adcircpy/forcing/winds/best_track.py +++ b/adcircpy/forcing/winds/best_track.py @@ -15,7 +15,6 @@ from shapely import ops from shapely.geometry import Point, Polygon from stormevents.nhc import VortexTrack -from stormevents.nhc.atcf import ATCF_Mode import utm from adcircpy.forcing.winds.base import WindForcing @@ -24,51 +23,52 @@ class BestTrackForcing(VortexTrack, WindForcing): def __init__( - self, - storm: Union[str, PathLike, DataFrame, io.BytesIO], - nws: int = None, - interval_seconds: int = None, - start_date: datetime = None, - end_date: datetime = None, - mode: ATCF_Mode = None, + self, + storm: Union[str, PathLike, DataFrame, io.BytesIO], + nws: int = None, + interval_seconds: int = None, + start_date: datetime = None, + end_date: datetime = None, ): if nws is None: nws = 20 valid_nws_values = [8, 19, 20] assert ( - nws in valid_nws_values + nws in valid_nws_values ), f'ATCF BestTrack can only use `nws` values in {valid_nws_values}' if interval_seconds is None: interval_seconds = 3600 VortexTrack.__init__( - self, - storm=storm, - start_date=start_date, - end_date=end_date, - file_deck='b', - mode=mode, - record_type='BEST', + self, + storm=storm, + start_date=start_date, + end_date=end_date, + file_deck='b', + advisories=['BEST'], ) WindForcing.__init__(self, nws=nws, interval_seconds=interval_seconds) @classmethod def from_fort22( - cls, - fort22: PathLike, - nws: int = None, - interval_seconds: int = None, - start_date: datetime = None, - end_date: datetime = None, + cls, + fort22: PathLike, + nws: int = None, + interval_seconds: int = None, + start_date: datetime = None, + end_date: datetime = None, ) -> 'WindForcing': - instance = cls.from_file(path=fort22, start_date=start_date, end_date=end_date) - WindForcing.__init__(instance, nws=nws, interval_seconds=interval_seconds) + instance = cls.from_file(path=fort22, start_date=start_date, + end_date=end_date) + WindForcing.__init__(instance, nws=nws, + interval_seconds=interval_seconds) return instance def summary( - self, output: Union[str, os.PathLike] = None, overwrite: bool = False, + self, output: Union[str, os.PathLike] = None, + overwrite: bool = False, ): min_storm_speed = numpy.min(self.data['speed']) max_storm_speed = numpy.max(self.data['speed']) @@ -77,7 +77,8 @@ def summary( min_central_pressure = numpy.min(self.data['central_pressure']) max_wind_speed = numpy.max(self.data['max_sustained_wind_speed']) start_loc = (self.data['longitude'][0], self.data['latitude'][0]) - end_loc = (self.data['longitude'].iloc[-1], self.data['latitude'].iloc[-1]) + end_loc = ( + self.data['longitude'].iloc[-1], self.data['latitude'].iloc[-1]) f = [ f'Summary of storm: {self.nhc_code}', f'min./max. track speed: {min_storm_speed} m/s, {max_storm_speed} m/s', @@ -143,13 +144,13 @@ def clip_to_bbox(self, bbox, bbox_crs): msg = f'bbox must be a {Bbox} instance.' assert isinstance(bbox, Bbox), msg bbox_pol = Polygon( - [ - [bbox.xmin, bbox.ymin], - [bbox.xmax, bbox.ymin], - [bbox.xmax, bbox.ymax], - [bbox.xmin, bbox.ymax], - [bbox.xmin, bbox.ymin], - ] + [ + [bbox.xmin, bbox.ymin], + [bbox.xmax, bbox.ymin], + [bbox.xmax, bbox.ymax], + [bbox.xmin, bbox.ymax], + [bbox.xmin, bbox.ymin], + ] ) _switch = True unique_dates = numpy.unique(self.data['datetime']) @@ -166,7 +167,8 @@ def clip_to_bbox(self, bbox, bbox_crs): transformer = Transformer.from_crs(df_crs, utm_crs, always_xy=True) p = Point(*transformer.transform(lon, lat)) pol = p.buffer(radii) - transformer = Transformer.from_crs(utm_crs, bbox_crs, always_xy=True) + transformer = Transformer.from_crs(utm_crs, bbox_crs, + always_xy=True) pol = ops.transform(transformer.transform, pol) if _switch is True: if not pol.intersects(bbox_pol): @@ -185,15 +187,16 @@ def clip_to_bbox(self, bbox, bbox_crs): break if _found_start_date is False: - raise Exception(f'No data within mesh bounding box for storm {self.storm_id}.') + raise Exception( + f'No data within mesh bounding box for storm {self.storm_id}.') def plot_track( - self, - axis: Axis = None, - show: bool = False, - color: str = 'k', - coastline: bool = True, - **kwargs, + self, + axis: Axis = None, + show: bool = False, + color: str = 'k', + coastline: bool = True, + **kwargs, ): kwargs.update({'color': color}) if axis is None: @@ -207,7 +210,7 @@ def plot_track( axis.quiver(row['longitude'], row['latitude'], U, V, **kwargs) if i % 6 == 0: axis.annotate( - row['datetime'], (row['longitude'], row['latitude']), + row['datetime'], (row['longitude'], row['latitude']), ) if show: axis.axis('scaled') @@ -221,6 +224,6 @@ def plot_wind_swath(self, isotach: int, segments: int = 91): plot_polygons(isotachs) plot_polygons(swath) pyplot.suptitle( - f'{self.nhc_code} - isotach {isotach} kt ({self.start_date} - {self.end_date})' + f'{self.nhc_code} - isotach {isotach} kt ({self.start_date} - {self.end_date})' ) pyplot.show() diff --git a/adcircpy/fort15.py b/adcircpy/fort15.py index 384be5db..7ed25d33 100644 --- a/adcircpy/fort15.py +++ b/adcircpy/fort15.py @@ -53,7 +53,7 @@ def within_wind_swath( if wind_speed is None: wind_speed = 34 - combined_wind_swaths = ops.unary_union(list(track.wind_swaths(wind_speed).values())) + combined_wind_swaths = ops.unary_union(list(track.wind_swaths(wind_speed)['BEST'].values())) return cls( station_types=station_types, diff --git a/tests/data/reference/example_3/fort.15.coldstart b/tests/data/reference/example_3/fort.15.coldstart index 22e72b3e..13787f04 100644 --- a/tests/data/reference/example_3/fort.15.coldstart +++ b/tests/data/reference/example_3/fort.15.coldstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:31 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER diff --git a/tests/data/reference/example_3/fort.15.hotstart b/tests/data/reference/example_3/fort.15.hotstart index 5d5a2a66..b8094aae 100644 --- a/tests/data/reference/example_3/fort.15.hotstart +++ b/tests/data/reference/example_3/fort.15.hotstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:31 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER diff --git a/tests/data/reference/example_3/fort.22 b/tests/data/reference/example_3/fort.22 index 5e0a988a..43397467 100644 --- a/tests/data/reference/example_3/fort.22 +++ b/tests/data/reference/example_3/fort.22 @@ -1,19 +1,19 @@ -AL, 18, 2012102118, , BEST, 0,143N, 774W, 25, 1006, LO, 0, , 0, 0, 0, 0, 1008, 180, 150, 35, 0, L, 0, , 0, 0, INVEST ,1 -AL, 18, 2012102200, , BEST, 0,139N, 778W, 25, 1005, LO, 0, , 0, 0, 0, 0, 1008, 180, 150, 35, 0, L, 0, ,224, 3, INVEST ,2 -AL, 18, 2012102206, , BEST, 0,135N, 782W, 25, 1003, LO, 0, , 0, 0, 0, 0, 1008, 225, 75, 35, 0, L, 0, ,224, 3, INVEST ,3 -AL, 18, 2012102212, , BEST, 0,131N, 786W, 30, 1002, TD, 0, , 0, 0, 0, 0, 1007, 250, 75, 0, 0, L, 0, ,224, 3, EIGHTEEN ,4 -AL, 18, 2012102218, , BEST, 0,127N, 787W, 35, 1000, TS, 34, NEQ, 50, 60, 0, 0, 1007, 250, 60, 45, 0, L, 0, ,194, 2, EIGHTEEN ,5 -AL, 18, 2012102300, , BEST, 0,126N, 784W, 40, 998, TS, 34, NEQ, 50, 60, 0, 0, 1007, 250, 40, 50, 0, L, 0, ,109, 2, SANDY ,6 -AL, 18, 2012102306, , BEST, 0,129N, 781W, 40, 998, TS, 34, NEQ, 70, 80, 0, 0, 1005, 240, 60, 50, 0, L, 0, , 44, 2, SANDY ,7 -AL, 18, 2012102312, , BEST, 0,134N, 779W, 40, 995, TS, 34, NEQ, 100, 100, 0, 0, 1005, 240, 60, 55, 0, L, 0, , 21, 3, SANDY ,8 -AL, 18, 2012102318, , BEST, 0,140N, 776W, 45, 993, TS, 34, NEQ, 100, 120, 0, 0, 1005, 240, 60, 55, 0, L, 0, , 26, 3, SANDY ,9 -AL, 18, 2012102400, , BEST, 0,147N, 773W, 55, 990, TS, 34, NEQ, 100, 150, 40, 40, 1007, 300, 60, 60, 0, L, 0, , 23, 4, SANDY ,10 -AL, 18, 2012102400, , BEST, 0,147N, 773W, 55, 990, TS, 50, NEQ, 0, 70, 0, 0, 1007, 300, 60, 60, 0, L, 0, , 23, 4, SANDY ,10 -AL, 18, 2012102406, , BEST, 0,156N, 771W, 60, 987, TS, 34, NEQ, 100, 150, 50, 50, 1007, 300, 45, 65, 0, L, 0, , 12, 5, SANDY ,11 -AL, 18, 2012102406, , BEST, 0,156N, 771W, 60, 987, TS, 50, NEQ, 50, 70, 20, 20, 1007, 300, 45, 65, 0, L, 0, , 12, 5, SANDY ,11 -AL, 18, 2012102412, , BEST, 0,166N, 769W, 65, 981, HU, 34, NEQ, 120, 160, 70, 70, 1006, 285, 40, 75, 0, L, 0, , 11, 5, SANDY ,12 -AL, 18, 2012102412, , BEST, 0,166N, 769W, 65, 981, HU, 50, NEQ, 50, 60, 40, 30, 1006, 285, 40, 75, 0, L, 0, , 11, 5, SANDY ,12 -AL, 18, 2012102412, , BEST, 0,166N, 769W, 65, 981, HU, 64, NEQ, 20, 20, 0, 0, 1006, 285, 40, 75, 0, L, 0, , 11, 5, SANDY ,12 -AL, 18, 2012102418, , BEST, 0,177N, 767W, 75, 972, HU, 34, NEQ, 150, 180, 70, 70, 1005, 290, 25, 85, 0, L, 0, , 10, 6, SANDY ,13 -AL, 18, 2012102418, , BEST, 0,177N, 767W, 75, 972, HU, 50, NEQ, 50, 60, 40, 40, 1005, 290, 25, 85, 0, L, 0, , 10, 6, SANDY ,13 -AL, 18, 2012102418, , BEST, 0,177N, 767W, 75, 972, HU, 64, NEQ, 25, 30, 20, 25, 1005, 290, 25, 85, 0, L, 0, , 10, 6, SANDY ,13 +AL, 18, 2012102118, , BEST, 0, 143N,774W, 25, 1006, LO, 0, , 0, 0, 0, 0, 1008, 180, 150, 35, 0, L, 0, , 0, 0, INVEST, 1 +AL, 18, 2012102200, , BEST, 0, 139N,778W, 25, 1005, LO, 0, , 0, 0, 0, 0, 1008, 180, 150, 35, 0, L, 0, ,224, 3, INVEST, 2 +AL, 18, 2012102206, , BEST, 0, 135N,782W, 25, 1003, LO, 0, , 0, 0, 0, 0, 1008, 225, 75, 35, 0, L, 0, ,224, 3, INVEST, 3 +AL, 18, 2012102212, , BEST, 0, 131N,786W, 30, 1002, TD, 0, , 0, 0, 0, 0, 1007, 250, 75, 0, 0, L, 0, ,224, 3, EIGHTEEN, 4 +AL, 18, 2012102218, , BEST, 0, 127N,787W, 35, 1000, TS, 34, NEQ, 50, 60, 0, 0, 1007, 250, 60, 45, 0, L, 0, ,194, 2, EIGHTEEN, 5 +AL, 18, 2012102300, , BEST, 0, 126N,784W, 40, 998, TS, 34, NEQ, 50, 60, 0, 0, 1007, 250, 40, 50, 0, L, 0, ,109, 2, SANDY, 6 +AL, 18, 2012102306, , BEST, 0, 129N,781W, 40, 998, TS, 34, NEQ, 70, 80, 0, 0, 1005, 240, 60, 50, 0, L, 0, , 44, 2, SANDY, 7 +AL, 18, 2012102312, , BEST, 0, 134N,779W, 40, 995, TS, 34, NEQ, 100, 100, 0, 0, 1005, 240, 60, 55, 0, L, 0, , 21, 3, SANDY, 8 +AL, 18, 2012102318, , BEST, 0, 140N,776W, 45, 993, TS, 34, NEQ, 100, 120, 0, 0, 1005, 240, 60, 55, 0, L, 0, , 26, 3, SANDY, 9 +AL, 18, 2012102400, , BEST, 0, 147N,773W, 55, 990, TS, 34, NEQ, 100, 150, 40, 40, 1007, 300, 60, 60, 0, L, 0, , 23, 4, SANDY, 10 +AL, 18, 2012102400, , BEST, 0, 147N,773W, 55, 990, TS, 50, NEQ, 0, 70, 0, 0, 1007, 300, 60, 60, 0, L, 0, , 23, 4, SANDY, 10 +AL, 18, 2012102406, , BEST, 0, 156N,771W, 60, 987, TS, 34, NEQ, 100, 150, 50, 50, 1007, 300, 45, 65, 0, L, 0, , 12, 5, SANDY, 11 +AL, 18, 2012102406, , BEST, 0, 156N,771W, 60, 987, TS, 50, NEQ, 50, 70, 20, 20, 1007, 300, 45, 65, 0, L, 0, , 12, 5, SANDY, 11 +AL, 18, 2012102412, , BEST, 0, 166N,769W, 65, 981, HU, 34, NEQ, 120, 160, 70, 70, 1006, 285, 40, 75, 0, L, 0, , 11, 5, SANDY, 12 +AL, 18, 2012102412, , BEST, 0, 166N,769W, 65, 981, HU, 50, NEQ, 50, 60, 40, 30, 1006, 285, 40, 75, 0, L, 0, , 11, 5, SANDY, 12 +AL, 18, 2012102412, , BEST, 0, 166N,769W, 65, 981, HU, 64, NEQ, 20, 20, 0, 0, 1006, 285, 40, 75, 0, L, 0, , 11, 5, SANDY, 12 +AL, 18, 2012102418, , BEST, 0, 177N,767W, 75, 972, HU, 34, NEQ, 150, 180, 70, 70, 1005, 290, 25, 85, 0, L, 0, , 10, 6, SANDY, 13 +AL, 18, 2012102418, , BEST, 0, 177N,767W, 75, 972, HU, 50, NEQ, 50, 60, 40, 40, 1005, 290, 25, 85, 0, L, 0, , 10, 6, SANDY, 13 +AL, 18, 2012102418, , BEST, 0, 177N,767W, 75, 972, HU, 64, NEQ, 25, 30, 20, 25, 1005, 290, 25, 85, 0, L, 0, , 10, 6, SANDY, 13 diff --git a/tests/data/reference/test_Stations/stations_1.fort.15 b/tests/data/reference/test_Stations/stations_1.fort.15 index 32baba97..810e64bb 100644 --- a/tests/data/reference/test_Stations/stations_1.fort.15 +++ b/tests/data/reference/test_Stations/stations_1.fort.15 @@ -1,44 +1,60 @@ -10 ! NSTAE --75.75 36.1875 ! 8651370 --75.5625 35.78125 ! 8652587 --75.6875 35.21875 ! 8654467 --76.6875 34.71875 ! 8656483 --77.9375 34.21875 ! 8658120 --77.8125 34.21875 ! 8658163 --78.9375 33.65625 ! 8661070 +14 ! NSTAE -79.1875 33.34375 ! 8662245 --79.9375 32.78125 ! 8665530 +-78.9375 33.65625 ! 8661070 -80.875 32.03125 ! 8670870 -10 ! NSTAV --75.75 36.1875 ! 8651370 +-77.9375 34.21875 ! 8658120 +-77.8125 34.21875 ! 8658163 -75.5625 35.78125 ! 8652587 +-75.75 36.1875 ! 8651370 -75.6875 35.21875 ! 8654467 +-79.9375 32.78125 ! 8665530 -76.6875 34.71875 ! 8656483 --77.9375 34.21875 ! 8658120 --77.8125 34.21875 ! 8658163 --78.9375 33.65625 ! 8661070 +-79.6875 32.84375 ! 8664941 +-80.4375 32.34375 ! 8668498 +-78.5 33.875 ! 8659897 +-75.625 35.21875 ! 8654400 +14 ! NSTAV -79.1875 33.34375 ! 8662245 --79.9375 32.78125 ! 8665530 +-78.9375 33.65625 ! 8661070 -80.875 32.03125 ! 8670870 -10 ! NSTAC --75.75 36.1875 ! 8651370 +-77.9375 34.21875 ! 8658120 +-77.8125 34.21875 ! 8658163 -75.5625 35.78125 ! 8652587 +-75.75 36.1875 ! 8651370 -75.6875 35.21875 ! 8654467 +-79.9375 32.78125 ! 8665530 -76.6875 34.71875 ! 8656483 --77.9375 34.21875 ! 8658120 --77.8125 34.21875 ! 8658163 --78.9375 33.65625 ! 8661070 +-79.6875 32.84375 ! 8664941 +-80.4375 32.34375 ! 8668498 +-78.5 33.875 ! 8659897 +-75.625 35.21875 ! 8654400 +14 ! NSTAC -79.1875 33.34375 ! 8662245 --79.9375 32.78125 ! 8665530 +-78.9375 33.65625 ! 8661070 -80.875 32.03125 ! 8670870 -10 ! NSTAM --75.75 36.1875 ! 8651370 +-77.9375 34.21875 ! 8658120 +-77.8125 34.21875 ! 8658163 -75.5625 35.78125 ! 8652587 +-75.75 36.1875 ! 8651370 -75.6875 35.21875 ! 8654467 +-79.9375 32.78125 ! 8665530 -76.6875 34.71875 ! 8656483 +-79.6875 32.84375 ! 8664941 +-80.4375 32.34375 ! 8668498 +-78.5 33.875 ! 8659897 +-75.625 35.21875 ! 8654400 +14 ! NSTAM +-79.1875 33.34375 ! 8662245 +-78.9375 33.65625 ! 8661070 +-80.875 32.03125 ! 8670870 -77.9375 34.21875 ! 8658120 -77.8125 34.21875 ! 8658163 --78.9375 33.65625 ! 8661070 --79.1875 33.34375 ! 8662245 +-75.5625 35.78125 ! 8652587 +-75.75 36.1875 ! 8651370 +-75.6875 35.21875 ! 8654467 -79.9375 32.78125 ! 8665530 --80.875 32.03125 ! 8670870 \ No newline at end of file +-76.6875 34.71875 ! 8656483 +-79.6875 32.84375 ! 8664941 +-80.4375 32.34375 ! 8668498 +-78.5 33.875 ! 8659897 +-75.625 35.21875 ! 8654400 \ No newline at end of file diff --git a/tests/data/reference/test_Stations/stations_2.fort.15 b/tests/data/reference/test_Stations/stations_2.fort.15 index 9ada9413..ba2e789d 100644 --- a/tests/data/reference/test_Stations/stations_2.fort.15 +++ b/tests/data/reference/test_Stations/stations_2.fort.15 @@ -1,11 +1,15 @@ -10 ! NSTAE --75.75 36.1875 ! 8651370 --75.5625 35.78125 ! 8652587 --75.6875 35.21875 ! 8654467 --76.6875 34.71875 ! 8656483 +14 ! NSTAE +-79.1875 33.34375 ! 8662245 +-78.9375 33.65625 ! 8661070 +-80.875 32.03125 ! 8670870 -77.9375 34.21875 ! 8658120 -77.8125 34.21875 ! 8658163 --78.9375 33.65625 ! 8661070 --79.1875 33.34375 ! 8662245 +-75.5625 35.78125 ! 8652587 +-75.75 36.1875 ! 8651370 +-75.6875 35.21875 ! 8654467 -79.9375 32.78125 ! 8665530 --80.875 32.03125 ! 8670870 \ No newline at end of file +-76.6875 34.71875 ! 8656483 +-79.6875 32.84375 ! 8664941 +-80.4375 32.34375 ! 8668498 +-78.5 33.875 ! 8659897 +-75.625 35.21875 ! 8654400 \ No newline at end of file diff --git a/tests/data/reference/test_best_track_run/fort.15.coldstart b/tests/data/reference/test_best_track_run/fort.15.coldstart index dc2ff006..2c7ae902 100644 --- a/tests/data/reference/test_best_track_run/fort.15.coldstart +++ b/tests/data/reference/test_best_track_run/fort.15.coldstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:30 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER diff --git a/tests/data/reference/test_best_track_run/fort.15.hotstart b/tests/data/reference/test_best_track_run/fort.15.hotstart index 22b6dc04..9990d56e 100644 --- a/tests/data/reference/test_best_track_run/fort.15.hotstart +++ b/tests/data/reference/test_best_track_run/fort.15.hotstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:30 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER diff --git a/tests/data/reference/test_best_track_run/fort.22 b/tests/data/reference/test_best_track_run/fort.22 index 39bc59e4..379c337f 100644 --- a/tests/data/reference/test_best_track_run/fort.22 +++ b/tests/data/reference/test_best_track_run/fort.22 @@ -1,3 +1,3 @@ -AL, 06, 2018091800, , BEST, 0,395N, 805W, 25, 1008, EX, 0, , 0, 0, 0, 0, 1013, 360, 160, 0, 0, , 0, , 59, 7, FLORENCE ,1 -AL, 06, 2018091806, , BEST, 0,413N, 768W, 25, 1007, EX, 0, , 0, 0, 0, 0, 1013, 360, 170, 0, 0, , 0, , 56, 17, FLORENCE ,2 -AL, 06, 2018091812, , BEST, 0,422N, 733W, 25, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 180, 30, 0, L, 0, , 70, 14, FLORENCE ,3 +AL, 06, 2018091800, , BEST, 0, 395N,805W, 25, 1008, EX, 0, , 0, 0, 0, 0, 1013, 360, 160, 0, 0, , 0, , 59, 7, FLORENCE, 1 +AL, 06, 2018091806, , BEST, 0, 413N,768W, 25, 1007, EX, 0, , 0, 0, 0, 0, 1013, 360, 170, 0, 0, , 0, , 56, 17, FLORENCE, 2 +AL, 06, 2018091812, , BEST, 0, 422N,733W, 25, 1006, EX, 34, NEQ, 0, 0, 0, 0, 1013, 360, 180, 30, 0, L, 0, , 70, 14, FLORENCE, 3 diff --git a/tests/data/reference/test_configuration/fort.15.coldstart b/tests/data/reference/test_configuration/fort.15.coldstart index 55f23133..6c568955 100644 --- a/tests/data/reference/test_configuration/fort.15.coldstart +++ b/tests/data/reference/test_configuration/fort.15.coldstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:30 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER diff --git a/tests/data/reference/test_configuration/fort.15.hotstart b/tests/data/reference/test_configuration/fort.15.hotstart index ebc67db1..d89d8e80 100644 --- a/tests/data/reference/test_configuration/fort.15.hotstart +++ b/tests/data/reference/test_configuration/fort.15.hotstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:30 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER diff --git a/tests/data/reference/test_tidal_run/fort.15.coldstart b/tests/data/reference/test_tidal_run/fort.15.coldstart index db7c1faf..74e90503 100644 --- a/tests/data/reference/test_tidal_run/fort.15.coldstart +++ b/tests/data/reference/test_tidal_run/fort.15.coldstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:30 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER @@ -30,38 +30,38 @@ Shinacock Inlet Coarse Grid ! RUNID 0 ! CORI - CORIOLIS PARAMETER - IGNORED IF NCOR = 1 8 ! NTIF - NUMBER OF TIDAL POTENTIAL CONSTITUENTS BEING FORCED starting 2008082300 Q1 -0.019256 6.49585E-05 0.695 1.11844 233.133 +0.019256 6.49585E-05 0.695 1.12324 70.3663 O1 -0.100514 6.75977E-05 0.695 1.11844 51.6756 +0.100514 6.75977E-05 0.695 1.12324 63.4847 P1 -0.046843 7.25229E-05 0.706 1 236.479 +0.046843 7.25229E-05 0.706 1 166.15 K1 -0.141565 7.29212E-05 0.736 1.07328 26.7972 +0.141565 7.29212E-05 0.736 1.07623 37.3306 N2 -0.046398 0.00013788 0.693 0.979305 257.129 +0.046398 0.00013788 0.693 0.978164 104.99 M2 -0.242334 0.000140519 0.693 0.979305 75.6716 +0.242334 0.000140519 0.693 0.978164 98.1087 S2 -0.112841 0.000145444 0.693 1 270 +0.112841 0.000145444 0.693 1 210 K2 -0.030704 0.000145842 0.693 1.18316 233.009 +0.030704 0.000145842 0.693 1.19252 254.075 8 Q1 -6.49585E-05 1.11844 233.133 +6.49585E-05 1.12324 70.3663 O1 -6.75977E-05 1.11844 51.6756 +6.75977E-05 1.12324 63.4847 P1 -7.25229E-05 1 236.479 +7.25229E-05 1 166.15 K1 -7.29212E-05 1.07328 26.7972 +7.29212E-05 1.07623 37.3306 N2 -0.00013788 0.979305 257.129 +0.00013788 0.978164 104.99 M2 -0.000140519 0.979305 75.6716 +0.000140519 0.978164 98.1087 S2 -0.000145444 1 270 +0.000145444 1 210 K2 -0.000145842 1.18316 233.009 +0.000145842 1.19252 254.075 Q1 1.17940985e-02 1.73069764e+02 1.13893401e-02 1.83698935e+02 @@ -691,5 +691,5 @@ K2 ! NCHOST - PROJECT HOST ! NCONV - CONVENTIONS ! NCCONT - CONTACT INFORMATION -2022-03-10 09:14 ! NCDATE - forcing start date +2022-04-20 07:30 ! NCDATE - forcing start date &metControl WindDragLimit=0.0025, DragLawString=default, outputWindDrag=F, invertedBarometerOnElevationBoundary=T \ diff --git a/tests/data/reference/test_tidal_run/fort.15.hotstart b/tests/data/reference/test_tidal_run/fort.15.hotstart index 350e128b..a8f51cd4 100644 --- a/tests/data/reference/test_tidal_run/fort.15.hotstart +++ b/tests/data/reference/test_tidal_run/fort.15.hotstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:31 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER @@ -30,38 +30,38 @@ Shinacock Inlet Coarse Grid ! RUNID 0 ! CORI - CORIOLIS PARAMETER - IGNORED IF NCOR = 1 8 ! NTIF - NUMBER OF TIDAL POTENTIAL CONSTITUENTS BEING FORCED starting 2008082300 Q1 -0.019256 6.49585E-05 0.695 1.11844 233.133 +0.019256 6.49585E-05 0.695 1.12324 70.3663 O1 -0.100514 6.75977E-05 0.695 1.11844 51.6756 +0.100514 6.75977E-05 0.695 1.12324 63.4847 P1 -0.046843 7.25229E-05 0.706 1 236.479 +0.046843 7.25229E-05 0.706 1 166.15 K1 -0.141565 7.29212E-05 0.736 1.07328 26.7972 +0.141565 7.29212E-05 0.736 1.07623 37.3306 N2 -0.046398 0.00013788 0.693 0.979305 257.129 +0.046398 0.00013788 0.693 0.978164 104.99 M2 -0.242334 0.000140519 0.693 0.979305 75.6716 +0.242334 0.000140519 0.693 0.978164 98.1087 S2 -0.112841 0.000145444 0.693 1 270 +0.112841 0.000145444 0.693 1 210 K2 -0.030704 0.000145842 0.693 1.18316 233.009 +0.030704 0.000145842 0.693 1.19252 254.075 8 Q1 -6.49585E-05 1.11844 233.133 +6.49585E-05 1.12324 70.3663 O1 -6.75977E-05 1.11844 51.6756 +6.75977E-05 1.12324 63.4847 P1 -7.25229E-05 1 236.479 +7.25229E-05 1 166.15 K1 -7.29212E-05 1.07328 26.7972 +7.29212E-05 1.07623 37.3306 N2 -0.00013788 0.979305 257.129 +0.00013788 0.978164 104.99 M2 -0.000140519 0.979305 75.6716 +0.000140519 0.978164 98.1087 S2 -0.000145444 1 270 +0.000145444 1 210 K2 -0.000145842 1.18316 233.009 +0.000145842 1.19252 254.075 Q1 1.17940985e-02 1.73069764e+02 1.13893401e-02 1.83698935e+02 @@ -691,5 +691,5 @@ K2 ! NCHOST - PROJECT HOST ! NCONV - CONVENTIONS ! NCCONT - CONTACT INFORMATION -2022-03-10 09:14 ! NCDATE - forcing start date +2022-04-20 07:30 ! NCDATE - forcing start date &metControl WindDragLimit=0.0025, DragLawString=default, outputWindDrag=F, invertedBarometerOnElevationBoundary=T \ diff --git a/tests/data/reference/test_tidal_run_cli/fort.15.coldstart b/tests/data/reference/test_tidal_run_cli/fort.15.coldstart index db7c1faf..74e90503 100644 --- a/tests/data/reference/test_tidal_run_cli/fort.15.coldstart +++ b/tests/data/reference/test_tidal_run_cli/fort.15.coldstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:30 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER @@ -30,38 +30,38 @@ Shinacock Inlet Coarse Grid ! RUNID 0 ! CORI - CORIOLIS PARAMETER - IGNORED IF NCOR = 1 8 ! NTIF - NUMBER OF TIDAL POTENTIAL CONSTITUENTS BEING FORCED starting 2008082300 Q1 -0.019256 6.49585E-05 0.695 1.11844 233.133 +0.019256 6.49585E-05 0.695 1.12324 70.3663 O1 -0.100514 6.75977E-05 0.695 1.11844 51.6756 +0.100514 6.75977E-05 0.695 1.12324 63.4847 P1 -0.046843 7.25229E-05 0.706 1 236.479 +0.046843 7.25229E-05 0.706 1 166.15 K1 -0.141565 7.29212E-05 0.736 1.07328 26.7972 +0.141565 7.29212E-05 0.736 1.07623 37.3306 N2 -0.046398 0.00013788 0.693 0.979305 257.129 +0.046398 0.00013788 0.693 0.978164 104.99 M2 -0.242334 0.000140519 0.693 0.979305 75.6716 +0.242334 0.000140519 0.693 0.978164 98.1087 S2 -0.112841 0.000145444 0.693 1 270 +0.112841 0.000145444 0.693 1 210 K2 -0.030704 0.000145842 0.693 1.18316 233.009 +0.030704 0.000145842 0.693 1.19252 254.075 8 Q1 -6.49585E-05 1.11844 233.133 +6.49585E-05 1.12324 70.3663 O1 -6.75977E-05 1.11844 51.6756 +6.75977E-05 1.12324 63.4847 P1 -7.25229E-05 1 236.479 +7.25229E-05 1 166.15 K1 -7.29212E-05 1.07328 26.7972 +7.29212E-05 1.07623 37.3306 N2 -0.00013788 0.979305 257.129 +0.00013788 0.978164 104.99 M2 -0.000140519 0.979305 75.6716 +0.000140519 0.978164 98.1087 S2 -0.000145444 1 270 +0.000145444 1 210 K2 -0.000145842 1.18316 233.009 +0.000145842 1.19252 254.075 Q1 1.17940985e-02 1.73069764e+02 1.13893401e-02 1.83698935e+02 @@ -691,5 +691,5 @@ K2 ! NCHOST - PROJECT HOST ! NCONV - CONVENTIONS ! NCCONT - CONTACT INFORMATION -2022-03-10 09:14 ! NCDATE - forcing start date +2022-04-20 07:30 ! NCDATE - forcing start date &metControl WindDragLimit=0.0025, DragLawString=default, outputWindDrag=F, invertedBarometerOnElevationBoundary=T \ diff --git a/tests/data/reference/test_tidal_run_cli/fort.15.hotstart b/tests/data/reference/test_tidal_run_cli/fort.15.hotstart index 350e128b..92ad1941 100644 --- a/tests/data/reference/test_tidal_run_cli/fort.15.hotstart +++ b/tests/data/reference/test_tidal_run_cli/fort.15.hotstart @@ -1,4 +1,4 @@ -created on 2022-03-10 16:14 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION +created on 2022-04-20 15:30 ! RUNDES - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION Shinacock Inlet Coarse Grid ! RUNID - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION 1 ! NFOVER - NONFATAL ERROR OVERRIDE OPTION 1 ! NABOUT - ABREVIATED OUTPUT OPTION PARAMETER @@ -30,38 +30,38 @@ Shinacock Inlet Coarse Grid ! RUNID 0 ! CORI - CORIOLIS PARAMETER - IGNORED IF NCOR = 1 8 ! NTIF - NUMBER OF TIDAL POTENTIAL CONSTITUENTS BEING FORCED starting 2008082300 Q1 -0.019256 6.49585E-05 0.695 1.11844 233.133 +0.019256 6.49585E-05 0.695 1.12324 70.3663 O1 -0.100514 6.75977E-05 0.695 1.11844 51.6756 +0.100514 6.75977E-05 0.695 1.12324 63.4847 P1 -0.046843 7.25229E-05 0.706 1 236.479 +0.046843 7.25229E-05 0.706 1 166.15 K1 -0.141565 7.29212E-05 0.736 1.07328 26.7972 +0.141565 7.29212E-05 0.736 1.07623 37.3306 N2 -0.046398 0.00013788 0.693 0.979305 257.129 +0.046398 0.00013788 0.693 0.978164 104.99 M2 -0.242334 0.000140519 0.693 0.979305 75.6716 +0.242334 0.000140519 0.693 0.978164 98.1087 S2 -0.112841 0.000145444 0.693 1 270 +0.112841 0.000145444 0.693 1 210 K2 -0.030704 0.000145842 0.693 1.18316 233.009 +0.030704 0.000145842 0.693 1.19252 254.075 8 Q1 -6.49585E-05 1.11844 233.133 +6.49585E-05 1.12324 70.3663 O1 -6.75977E-05 1.11844 51.6756 +6.75977E-05 1.12324 63.4847 P1 -7.25229E-05 1 236.479 +7.25229E-05 1 166.15 K1 -7.29212E-05 1.07328 26.7972 +7.29212E-05 1.07623 37.3306 N2 -0.00013788 0.979305 257.129 +0.00013788 0.978164 104.99 M2 -0.000140519 0.979305 75.6716 +0.000140519 0.978164 98.1087 S2 -0.000145444 1 270 +0.000145444 1 210 K2 -0.000145842 1.18316 233.009 +0.000145842 1.19252 254.075 Q1 1.17940985e-02 1.73069764e+02 1.13893401e-02 1.83698935e+02 @@ -691,5 +691,5 @@ K2 ! NCHOST - PROJECT HOST ! NCONV - CONVENTIONS ! NCCONT - CONTACT INFORMATION -2022-03-10 09:14 ! NCDATE - forcing start date +2022-04-20 07:30 ! NCDATE - forcing start date &metControl WindDragLimit=0.0025, DragLawString=default, outputWindDrag=F, invertedBarometerOnElevationBoundary=T \