Skip to content

Commit 67c7ad4

Browse files
committed
Revert units changes since NDBC decides these
1 parent 23a9823 commit 67c7ad4

1 file changed

Lines changed: 38 additions & 38 deletions

File tree

mhkit/wave/io/ndbc.py

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -716,9 +716,9 @@ def parameter_units(parameter=""):
716716
}
717717
elif parameter == "cwind":
718718
units = {
719-
"WDIR": "degree_N",
719+
"WDIR": "degT", # degree True North
720720
"WSPD": "m/s",
721-
"GDR": "degree_N",
721+
"GDR": "degT", # degree True North
722722
"GST": "m/s",
723723
"GTIME": "hhmm",
724724
}
@@ -729,16 +729,16 @@ def parameter_units(parameter=""):
729729
}
730730
elif parameter == "derived2":
731731
units = {
732-
"CHILL": "degree_C",
733-
"HEAT": "degree_C",
732+
"CHILL": "degC",
733+
"HEAT": "degC",
734734
"ICE": "cm/hr",
735735
"WSPD10": "m/s",
736736
"WSPD20": "m/s",
737737
}
738738
elif parameter == "ocean":
739739
units = {
740740
"DEPTH": "m",
741-
"OTMP": "degree_C",
741+
"OTMP": "degC",
742742
"COND": "mS/cm",
743743
"SAL": "psu",
744744
"O2%": "%",
@@ -766,34 +766,34 @@ def parameter_units(parameter=""):
766766
units = {
767767
"WVHT": "m",
768768
"SwH": "m",
769-
"SwP": "s",
769+
"SwP": "sec",
770770
"WWH": "m",
771-
"WWP": "s",
771+
"WWP": "sec",
772772
"SwD": "-",
773-
"WWD": "degree_N",
773+
"WWD": "degT", # degree True North
774774
"STEEPNESS": "-",
775-
"APD": "s",
776-
"MWD": "degree_N",
775+
"APD": "sec",
776+
"MWD": "degT", # degree True North
777777
}
778778
elif parameter == "srad":
779779
units = {
780-
"SRAD1": "W/m^2",
781-
"SRAD2": "W/m^2",
782-
"SRAD3": "W/m^2",
780+
"SRAD1": "w/m2",
781+
"SRAD2": "w/m2",
782+
"SRAD3": "w/m2",
783783
}
784784
elif parameter == "stdmet":
785785
units = {
786-
"WDIR": "degree_N",
786+
"WDIR": "degT", # degree True North
787787
"WSPD": "m/s",
788788
"GST": "m/s",
789789
"WVHT": "m",
790-
"DPD": "s",
791-
"APD": "s",
792-
"MWD": "degree_N",
790+
"DPD": "sec",
791+
"APD": "sec",
792+
"MWD": "degT", # degree True North
793793
"PRES": "hPa",
794-
"ATMP": "degree_C",
795-
"WTMP": "degree_C",
796-
"DEWP": "degree_C",
794+
"ATMP": "degC",
795+
"WTMP": "degC",
796+
"DEWP": "degC",
797797
"VIS": "nmi",
798798
"PTDY": "hPa",
799799
"TIDE": "ft",
@@ -803,7 +803,7 @@ def parameter_units(parameter=""):
803803
"PRES": "hPa",
804804
"PTIME": "hhmm",
805805
"WSPD": "m/s",
806-
"WDIR": "degree_N",
806+
"WDIR": "degT", # degree True North
807807
"WTIME": "hhmm",
808808
}
809809
elif parameter == "swden":
@@ -821,34 +821,34 @@ def parameter_units(parameter=""):
821821
"swden": "m^2/Hz",
822822
"PRES": "hPa",
823823
"PTIME": "hhmm",
824-
"WDIR": "degree_N",
824+
"WDIR": "degT", # degree True North
825825
"WTIME": "hhmm",
826-
"DPD": "s",
827-
"MWD": "degree_N",
828-
"ATMP": "degree_C",
829-
"WTMP": "degree_C",
830-
"DEWP": "degree_C",
826+
"DPD": "sec",
827+
"MWD": "degT", # degree True North
828+
"ATMP": "degC",
829+
"WTMP": "degC",
830+
"DEWP": "degC",
831831
"VIS": "nmi",
832832
"PTDY": "hPa",
833833
"TIDE": "ft",
834-
"SRAD1": "W/m^2",
835-
"SRAD2": "W/m^2",
836-
"SRAD3": "W/m^2",
834+
"SRAD1": "w/m2",
835+
"SRAD2": "w/m2",
836+
"SRAD3": "w/m2",
837837
"WVHT": "m",
838838
"SwH": "m",
839-
"SwP": "s",
839+
"SwP": "sec",
840840
"WWH": "m",
841-
"WWP": "s",
841+
"WWP": "sec",
842842
"SwD": "-",
843-
"WWD": "degree_N",
843+
"WWD": "degT", # degree True North
844844
"STEEPNESS": "-",
845-
"APD": "s",
845+
"APD": "sec",
846846
"RATE": "mm/h",
847847
"PCT": "%",
848848
"SDEV": "-",
849849
"ACCUM": "mm",
850850
"DEPTH": "m",
851-
"OTMP": "degree_C",
851+
"OTMP": "degC",
852852
"COND": "mS/cm",
853853
"SAL": "psu",
854854
"O2%": "%",
@@ -857,15 +857,15 @@ def parameter_units(parameter=""):
857857
"TURB": "FTU",
858858
"PH": "-",
859859
"EH": "mv",
860-
"CHILL": "degree_C",
861-
"HEAT": "degree_C",
860+
"CHILL": "degC",
861+
"HEAT": "degC",
862862
"ICE": "cm/hr",
863863
"WSPD": "m/s",
864864
"WSPD10": "m/s",
865865
"WSPD20": "m/s",
866866
"T": "-",
867867
"HEIGHT": "m",
868-
"GDR": "degree_N",
868+
"GDR": "degT", # degree True North
869869
"GST": "m/s",
870870
"GTIME": "hhmm",
871871
"DEP01": "m",

0 commit comments

Comments
 (0)