GitHub Action: Apply Pep8-formatting

C2SM · Feb 12, 2025 · 0be3d78 · 0be3d78
1 parent cade413
commit 0be3d78
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 21 deletions.
diff --git a/python/WrapExtpar.py b/python/WrapExtpar.py
@@ -80,12 +80,13 @@ def main():
     lradtopo = config.get('lradtopo', False)
     radtopo_radius = config.get('radtopo_radius', 40000.0)
 
-    generate_external_parameters(
-        igrid_type, args.input_grid, iaot_type, ilu_type, ialb_type,
-        isoil_type, itopo_type, it_cl_type, iera_type, iemiss_type,
-        enable_cdnc, enable_edgar,
-        radtopo_radius, args.raw_data_path, args.run_dir, args.account,
-        args.host, args.no_batch_job, lurban, lsgsl, lfilter_oro, lradtopo)
+    generate_external_parameters(igrid_type, args.input_grid, iaot_type,
+                                 ilu_type, ialb_type, isoil_type, itopo_type,
+                                 it_cl_type, iera_type, iemiss_type,
+                                 enable_cdnc, enable_edgar, radtopo_radius,
+                                 args.raw_data_path, args.run_dir,
+                                 args.account, args.host, args.no_batch_job,
+                                 lurban, lsgsl, lfilter_oro, lradtopo)
 
 
 def generate_external_parameters(igrid_type,
@@ -663,6 +664,7 @@ def setup_urban_namelist(args):
 
     return namelist
 
+
 def setup_cdnc_namelist(args):
     namelist = {}
 
@@ -672,15 +674,21 @@ def setup_cdnc_namelist(args):
 
     return namelist
 
+
 def setup_edgar_namelist(args):
     namelist = {}
 
     namelist['raw_data_edgar_path'] = args['raw_data_path']
-    namelist['raw_data_edgar_filename_bc'] = 'v8.1_FT2022_AP_BC_2022_TOTALS_flx.nc'
-    namelist['raw_data_edgar_filename_oc'] = 'v8.1_FT2022_AP_OC_2022_TOTALS_flx.nc'
-    namelist['raw_data_edgar_filename_so2'] = 'v8.1_FT2022_AP_SO2_2022_TOTALS_flx.nc'
-    namelist['raw_data_edgar_filename_nox'] = 'v8.1_FT2022_AP_NOx_2022_TOTALS_flx.nc'
-    namelist['raw_data_edgar_filename_nh3'] = 'v8.1_FT2022_AP_NH3_2022_TOTALS_flx.nc'
+    namelist[
+        'raw_data_edgar_filename_bc'] = 'v8.1_FT2022_AP_BC_2022_TOTALS_flx.nc'
+    namelist[
+        'raw_data_edgar_filename_oc'] = 'v8.1_FT2022_AP_OC_2022_TOTALS_flx.nc'
+    namelist[
+        'raw_data_edgar_filename_so2'] = 'v8.1_FT2022_AP_SO2_2022_TOTALS_flx.nc'
+    namelist[
+        'raw_data_edgar_filename_nox'] = 'v8.1_FT2022_AP_NOx_2022_TOTALS_flx.nc'
+    namelist[
+        'raw_data_edgar_filename_nh3'] = 'v8.1_FT2022_AP_NH3_2022_TOTALS_flx.nc'
     namelist['edgar_buffer_file'] = 'edgar_buffer.nc'
 
     return namelist
@@ -740,7 +748,7 @@ def setup_runscript(args):
     if args['igrid_type'] == 1:
         executables.append('"extpar_era_to_buffer.py" ')
         executables.append('"extpar_emiss_to_buffer.py" ')
-    
+
         # ICON only executables
         if args['enable_cdnc']:
             executables.append('"extpar_cdnc_to_buffer.py" ')

diff --git a/test/pytest/test_wrap_extpar.py b/test/pytest/test_wrap_extpar.py
@@ -221,7 +221,13 @@ def test_generate_globe_filenames():
 
 
 def test_setup_runscript_with_urban_cosmo():
-    args = {'account': 'test_account', 'lurban': True, 'igrid_type': 2, 'enable_cdnc': False, 'enable_edgar': False}
+    args = {
+        'account': 'test_account',
+        'lurban': True,
+        'igrid_type': 2,
+        'enable_cdnc': False,
+        'enable_edgar': False
+    }
     expected_runscript = {
         'account':
         'test_account',
@@ -240,7 +246,13 @@ def test_setup_runscript_with_urban_cosmo():
 
 
 def test_setup_runscript_without_urban_icon():
-    args = {'account': 'test_account', 'lurban': False, 'igrid_type': 1, 'enable_cdnc': False, 'enable_edgar': False}
+    args = {
+        'account': 'test_account',
+        'lurban': False,
+        'igrid_type': 1,
+        'enable_cdnc': False,
+        'enable_edgar': False
+    }
     expected_runscript = {
         'account':
         'test_account',
@@ -257,8 +269,15 @@ def test_setup_runscript_without_urban_icon():
     }
     assert setup_runscript(args) == expected_runscript
 
+
 def test_setup_runscript_without_urban_with_edgar_and_cdnc_icon():
-    args = {'account': 'test_account', 'lurban': False, 'igrid_type': 1, 'enable_cdnc': True, 'enable_edgar': True}
+    args = {
+        'account': 'test_account',
+        'lurban': False,
+        'igrid_type': 1,
+        'enable_cdnc': True,
+        'enable_edgar': True
+    }
     expected_runscript = {
         'account':
         'test_account',
@@ -725,20 +744,17 @@ def test_setup_oro_namelist_icon_invalid():
 
 
 def test_setup_cdnc_namelist():
-    args = {
-        'raw_data_path': '/path/to/raw/data'
-    }
+    args = {'raw_data_path': '/path/to/raw/data'}
     expected_namelist = {
         'raw_data_cdnc_path': '/path/to/raw/data',
         'cdnc_buffer_file': 'cdnc_buffer.nc',
         'raw_data_cdnc_filename': 'modis_cdnc_climatology_Q06.nc'
     }
     assert setup_cdnc_namelist(args) == expected_namelist
 
+
 def test_setup_edgar_namelist():
-    args = {
-        'raw_data_path': '/path/to/raw/data'
-    }
+    args = {'raw_data_path': '/path/to/raw/data'}
     expected_namelist = {
         'raw_data_edgar_path': '/path/to/raw/data',
         'raw_data_edgar_filename_bc': 'v8.1_FT2022_AP_BC_2022_TOTALS_flx.nc',