cleanup

noaa-oar-arl · Apr 7, 2023 · af3c746 · af3c746
1 parent 8ca06c3
commit af3c746
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/monetio/obs/ish.py b/monetio/obs/ish.py
@@ -174,10 +174,10 @@ def _clean(frame):
         frame = ISH._clean_column_by_name(frame, "ws", multiplier=10)  # m/s
         frame = ISH._clean_column_by_name(frame, "ceiling", missing=99999)
         frame = ISH._clean_column_by_name(frame, "vsb", missing=999999)
+        frame = ISH._clean_column_by_name(frame, "vsb", missing=99999)  # m
         frame = ISH._clean_column_by_name(frame, "t", multiplier=10, missing=9999)  # degC
         frame = ISH._clean_column_by_name(frame, "dpt", multiplier=10, missing=9999)  # degC
         frame = ISH._clean_column_by_name(frame, "p", multiplier=10, missing=99999)  # hPa
-        frame = ISH._clean_column_by_name(frame, "vsb", missing=99999)  # m
         return frame
 
     @staticmethod
@@ -307,8 +307,6 @@ def add_data(
         -------
         DataFrame
         """
-        from numpy import NaN
-
         self.dates = pd.to_datetime(dates)
         self.verbose = verbose
         if verbose:
@@ -347,12 +345,10 @@ def add_data(
             dfs = [dask.delayed(self.read_data_frame)(f) for f in objs]
             dff = dd.from_delayed(dfs)
             self.df = dff.compute(num_workers=n_procs)
-            self.df.loc[self.df.vsb == 99999, "vsb"] = NaN
         else:
             if verbose:
                 print(f"Aggregating {len(urls.name)} URLs...")
             self.df = self.aggregrate_files(urls, n_procs=n_procs)
-            # self.df.loc[self.df.vsb == 99999, "vsb"] = NaN
 
         if resample:
             if verbose:

diff --git a/tests/test_ish.py b/tests/test_ish.py
@@ -65,6 +65,7 @@ def test_ish_one_site(download):
     } < set(df.columns), "data columns"
     assert (df.t < 100).all(), "temp in degC"
     assert (df.dpt < 100).all(), "temp in degC"
+    assert (df.vsb == 99999).sum() == 0
 
 
 def test_ish_no_resample():