test_datelist update

dbekaert · Jul 13, 2023 · be19195 · be19195
1 parent 9576989
commit be19195
Show file tree

Hide file tree

Showing 21 changed files with 90 additions and 217 deletions.
diff --git a/test/scenario_5/hgt.hdr b/test/scenario_5/hgt.hdr
diff --git a/test/scenario_5/hgt.rdr b/test/scenario_5/hgt.rdr
diff --git a/test/scenario_5/hgt.rdr.aux.xml b/test/scenario_5/hgt.rdr.aux.xml
diff --git a/test/scenario_5/lat.hdr b/test/scenario_5/lat.hdr
diff --git a/test/scenario_5/lat.rdr b/test/scenario_5/lat.rdr
diff --git a/test/scenario_5/lat.rdr.aux.xml b/test/scenario_5/lat.rdr.aux.xml
diff --git a/test/scenario_5/lat.rdr.vrt b/test/scenario_5/lat.rdr.vrt
diff --git a/test/scenario_5/lon.hdr b/test/scenario_5/lon.hdr
diff --git a/test/scenario_5/lon.rdr b/test/scenario_5/lon.rdr
diff --git a/test/scenario_5/lon.rdr.aux.xml b/test/scenario_5/lon.rdr.aux.xml
diff --git a/test/scenario_5/lon.rdr.vrt b/test/scenario_5/lon.rdr.vrt
diff --git a/test/scenario_5/los.hdr b/test/scenario_5/los.hdr
diff --git a/test/scenario_5/los.rdr b/test/scenario_5/los.rdr
diff --git a/test/scenario_5/los.rdr.vrt b/test/scenario_5/los.rdr.vrt
diff --git a/test/scenario_5/warpedDEM.dem b/test/scenario_5/warpedDEM.dem
diff --git a/test/scenario_5/warpedDEM.dem.vrt b/test/scenario_5/warpedDEM.dem.vrt
diff --git a/test/scenario_5/warpedDEM.hdr b/test/scenario_5/warpedDEM.hdr
diff --git a/test/scenario_5/wmtype b/test/scenario_5/wmtype
diff --git a/test/scenario_5/wrfout_d01_2010-06-25 b/test/scenario_5/wrfout_d01_2010-06-25
diff --git a/test/scenario_5/wrfplev_d01_2010-06-25 b/test/scenario_5/wrfplev_d01_2010-06-25
diff --git a/test/test_datelist.py b/test/test_datelist.py
@@ -1,24 +1,20 @@
+import datetime
 import os
-import glob
-import pytest
-import subprocess
-import shutil
+# import glob
+# import subprocess
+# import shutil
 import yaml
-import numpy as np
+# import numpy as np
 from test import TEST_DIR, WM
-
+from RAiDER.cli.raider import read_template_file
 
 def test_datelist():
-    SCENARIO_DIR = os.path.join(TEST_DIR, 'datelist')
-
-    if os.path.exists(SCENARIO_DIR):
-        shutil.rmtree(SCENARIO_DIR) 
-    os.makedirs(SCENARIO_DIR, exist_ok=False)
-
+    SCENARIO_DIR = os.path.join(TEST_DIR, 'scenario_5')
     dates = ['20200124', '20200130']
+    true_dates = [datetime.datetime(2020,1,24), datetime.datetime(2020,1,30)]
 
     dct_group = {
-       'aoi_group': {'bounding_box': [28, 39, -123, -112]},
+       'aoi_group': {'bounding_box': [28, 28.3, -116.3, -116]},
        'date_group': {'date_list': dates},
        'time_group': {'time': '00:00:00'},
        'weather_model': WM,
@@ -34,28 +30,16 @@ def test_datelist():
     with open(dst, 'w') as fh:
         yaml.dump(params, fh, default_flow_style=False)
 
-
-    ## run raider on new file (two dates)
-    cmd  = f'raider.py {dst}'
-    proc = subprocess.run(cmd.split(), stdout=subprocess.PIPE, universal_newlines=True)
-    assert np.isclose(proc.returncode, 0)
-
-    ## check that four files (2x date) were created
-    n_files = len(glob.glob(os.path.join(SCENARIO_DIR, 'weather_files/*.nc')))
-    n_dates = len(dates)
-    assert np.isclose(n_files, n_dates*2), 'Incorrect number of files produced'
-
-    ## clean up
-    shutil.rmtree(SCENARIO_DIR)
-
-    return dst
+    param_dict = read_template_file(dst)
+
+    assert param_dict['date_list'] == true_dates
 
 
 def test_datestep():
-    SCENARIO_DIR = os.path.join(TEST_DIR, 'datelist')
-    os.makedirs(SCENARIO_DIR, exist_ok=False)
+    SCENARIO_DIR = os.path.join(TEST_DIR, 'scenario_5')
     st, en, step = '20200124', '20200130', 3
     n_dates      = 3
+    true_dates = [datetime.datetime(2020,1,24), datetime.datetime(2020,1,27), datetime.datetime(2020,1,30)]
 
     dct_group = {
        'aoi_group': {'bounding_box': [28, 39, -123, -112]},
@@ -74,15 +58,82 @@ def test_datestep():
     with open(dst, 'w') as fh:
         yaml.dump(params, fh, default_flow_style=False)
 
+    param_dict = read_template_file(dst)
+    assert param_dict['date_list'] == true_dates
+
+
+
+# def test_datelist():
+#     SCENARIO_DIR = os.path.join(TEST_DIR, 'scenario_5')
+
+#     dates = ['20200124', '20200130']
+
+#     dct_group = {
+#        'aoi_group': {'bounding_box': [28, 28.3, -116.3, -116]},
+#        'date_group': {'date_list': dates},
+#        'time_group': {'time': '00:00:00'},
+#        'weather_model': WM,
+#        'runtime_group': {
+#             'output_directory': SCENARIO_DIR,
+#             'weather_model_directory': os.path.join(SCENARIO_DIR, 'weather_files')
+#             }
+#       }
+
+#     params = dct_group
+#     dst = os.path.join(SCENARIO_DIR, 'temp.yaml')
+
+#     with open(dst, 'w') as fh:
+#         yaml.dump(params, fh, default_flow_style=False)
+
+
+#     ## run raider on new file (two dates)
+#     cmd  = f'raider.py {dst}'
+#     proc = subprocess.run(cmd.split(), stdout=subprocess.PIPE, universal_newlines=True)
+#     assert np.isclose(proc.returncode, 0)
+
+#     ## check that four files (2x date) were created
+#     n_files = len(glob.glob(os.path.join(SCENARIO_DIR, 'weather_files/*.nc')))
+#     n_dates = len(dates)
+#     assert np.isclose(n_files, n_dates*2), 'Incorrect number of files produced'
+
+#     ## clean up
+#     shutil.rmtree(SCENARIO_DIR)
+
+#     return dst
+
+
+# def test_datestep():
+#     SCENARIO_DIR = os.path.join(TEST_DIR, 'datelist')
+#     os.makedirs(SCENARIO_DIR, exist_ok=False)
+    # st, en, step = '20200124', '20200130', 3
+    # n_dates      = 3
+
+    # dct_group = {
+    #    'aoi_group': {'bounding_box': [28, 39, -123, -112]},
+    #    'date_group': {'date_start': st, 'date_end': en, 'date_step': step},
+    #    'time_group': {'time': '00:00:00'},
+    #    'weather_model': WM,
+    #    'runtime_group': {
+    #         'output_directory': SCENARIO_DIR,
+    #         'weather_model_directory': os.path.join(SCENARIO_DIR, 'weather_files')
+    #         }
+    #   }
+
+    # params = dct_group
+    # dst = os.path.join(SCENARIO_DIR, 'temp.yaml')
+
+    # with open(dst, 'w') as fh:
+    #     yaml.dump(params, fh, default_flow_style=False)
+
 
-    ## run raider on new file (two dates)
-    cmd  = f'raider.py {dst}'
-    proc = subprocess.run(cmd.split(), stdout=subprocess.PIPE, universal_newlines=True)
-    assert np.isclose(proc.returncode, 0)
+    # ## run raider on new file (two dates)
+    # cmd  = f'raider.py {dst}'
+    # proc = subprocess.run(cmd.split(), stdout=subprocess.PIPE, universal_newlines=True)
+    # assert np.isclose(proc.returncode, 0)
 
-    ## check that four files (2x date) were created
-    n_files = len(glob.glob(os.path.join(SCENARIO_DIR, 'weather_files/*.nc')))
-    assert np.isclose(n_files, n_dates*2), 'Incorrect number of files produced'
+    # ## check that four files (2x date) were created
+    # n_files = len(glob.glob(os.path.join(SCENARIO_DIR, 'weather_files/*.nc')))
+    # assert np.isclose(n_files, n_dates*2), 'Incorrect number of files produced'
 
-    ## clean up
-    shutil.rmtree(SCENARIO_DIR)
+    # ## clean up
+    # shutil.rmtree(SCENARIO_DIR)