rebase prep

manjirigunaji · Oct 31, 2023 · 3ba2c31 · 3ba2c31
1 parent 579f8fb
commit 3ba2c31
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 14 deletions.
diff --git a/test/test_analysis_assim.py b/test/test_analysis_assim.py
@@ -1,6 +1,7 @@
 import os
 import pytest
-from urlgennwm import generate_urls
+from urlgennwm import generate_urls_operational
+
 
 @pytest.fixture
 def generated_urls():
@@ -13,11 +14,24 @@ def generated_urls():
     runinput = 5  # Set to 5 for the analysis_assim folder
     urlbaseinput = 2
     meminput = 1
+    fileoutput = True
 
-    generate_urls(start_date, end_date, fcst_cycle, lead_time, varinput, geoinput, runinput, urlbaseinput, meminput)
+    generate_urls_operational(
+        start_date,
+        end_date,
+        fcst_cycle,
+        lead_time,
+        varinput,
+        geoinput,
+        runinput,
+        urlbaseinput,
+        meminput,
+        fileoutput,
+    )
 
     yield
 
+
 def test_generate_urls_for_analysis_assim(generated_urls):
     assert os.path.exists("filenamelist.txt")
 

diff --git a/test/test_analysis_extend.py b/test/test_analysis_extend.py
@@ -1,6 +1,7 @@
 import os
 import pytest
-from urlgennwm import generate_urls
+from urlgennwm import generate_urls_operational
+
 
 @pytest.fixture
 def generated_urls_for_analysis_assim_extend():
@@ -13,12 +14,27 @@ def generated_urls_for_analysis_assim_extend():
     runinput = 6
     urlbaseinput = 2
     meminput = 1
+    fileoutput = True
 
-    generate_urls(start_date, end_date, fcst_cycle, lead_time, varinput, geoinput, runinput, urlbaseinput, meminput)
+    generate_urls_operational(
+        start_date,
+        end_date,
+        fcst_cycle,
+        lead_time,
+        varinput,
+        geoinput,
+        runinput,
+        urlbaseinput,
+        meminput,
+        fileoutput,
+    )
 
     yield
 
-def test_generate_urls_for_analysis_assim_extend(generated_urls_for_analysis_assim_extend):
+
+def test_generate_urls_for_analysis_assim_extend(
+    generated_urls_for_analysis_assim_extend,
+):
     assert os.path.exists("filenamelist.txt")
 
     expected_urls = [

diff --git a/test/test_conus.py b/test/test_conus.py
@@ -1,6 +1,7 @@
 import os
 import pytest
-from urlgennwm import generate_urls
+from urlgennwm import generate_urls_operational
+
 
 @pytest.fixture
 def generated_urls():
@@ -13,20 +14,33 @@ def generated_urls():
     runinput = 1
     urlbaseinput = 2
     meminput = 1
+    fileoutput = True
 
-    generate_urls(start_date, end_date, fcst_cycle, lead_time, varinput, geoinput, runinput, urlbaseinput, meminput)
+    generate_urls_operational(
+        start_date,
+        end_date,
+        fcst_cycle,
+        lead_time,
+        varinput,
+        geoinput,
+        runinput,
+        urlbaseinput,
+        meminput,
+        fileoutput,
+    )
 
     yield
 
+
 def test_generate_urls_for_conus(generated_urls):
     assert os.path.exists("filenamelist.txt")
 
     # Modify the expected URL to match the "conus" geography
     expected_urls = [
-       'https://nomads.ncep.noaa.gov/pub/data/nccf/com/nwm/post-processed/WMS/nwm.20231015/short_range/nwm.t00z.short_range.channel_rt.f001.conus.nc',
-       'https://nomads.ncep.noaa.gov/pub/data/nccf/com/nwm/post-processed/WMS/nwm.20231015/short_range/nwm.t00z.short_range.channel_rt.f018.conus.nc',
-       'https://nomads.ncep.noaa.gov/pub/data/nccf/com/nwm/post-processed/WMS/nwm.20231015/short_range/nwm.t08z.short_range.channel_rt.f001.conus.nc',
-       'https://nomads.ncep.noaa.gov/pub/data/nccf/com/nwm/post-processed/WMS/nwm.20231015/short_range/nwm.t08z.short_range.channel_rt.f018.conus.nc'
+        "https://nomads.ncep.noaa.gov/pub/data/nccf/com/nwm/post-processed/WMS/nwm.20231015/short_range/nwm.t00z.short_range.channel_rt.f001.conus.nc",
+        "https://nomads.ncep.noaa.gov/pub/data/nccf/com/nwm/post-processed/WMS/nwm.20231015/short_range/nwm.t00z.short_range.channel_rt.f018.conus.nc",
+        "https://nomads.ncep.noaa.gov/pub/data/nccf/com/nwm/post-processed/WMS/nwm.20231015/short_range/nwm.t08z.short_range.channel_rt.f001.conus.nc",
+        "https://nomads.ncep.noaa.gov/pub/data/nccf/com/nwm/post-processed/WMS/nwm.20231015/short_range/nwm.t08z.short_range.channel_rt.f018.conus.nc",
     ]
 
     with open("filenamelist.txt", "r") as file:

diff --git a/test/test_forcing.py b/test/test_forcing.py
@@ -1,6 +1,7 @@
 import os
 import pytest
-from urlgennwm import generate_urls
+from urlgennwm import generate_urls_operational
+
 
 @pytest.fixture
 def generated_urls_for_forcing_medium_range():
@@ -13,10 +14,25 @@ def generated_urls_for_forcing_medium_range():
     runinput = 2
     urlbaseinput = 1
     meminput = 1
+    fileoutput = True
 
-    generate_urls(start_date, end_date, fcst_cycle, lead_time, varinput, geoinput, runinput, urlbaseinput, meminput)
+    generate_urls_operational(
+        start_date,
+        end_date,
+        fcst_cycle,
+        lead_time,
+        varinput,
+        geoinput,
+        runinput,
+        urlbaseinput,
+        meminput,
+        fileoutput,
+    )
 
     yield
 
-def test_generate_urls_for_forcing_medium_range(generated_urls_for_forcing_medium_range):
+
+def test_generate_urls_for_forcing_medium_range(
+    generated_urls_for_forcing_medium_range,
+):
     assert os.path.exists("filenamelist.txt")