Skip to content

Commit

Permalink
GitHub Action: Apply Pep8-formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Feb 12, 2025
1 parent 7343c21 commit 8503927
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 18 deletions.
32 changes: 20 additions & 12 deletions python/WrapExtpar.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -663,6 +664,7 @@ def setup_urban_namelist(args):

return namelist


def setup_cdnc_namelist(args):
namelist = {}

Expand All @@ -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
Expand Down Expand Up @@ -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" ')
Expand Down
9 changes: 3 additions & 6 deletions test/pytest/test_wrap_extpar.py
Original file line number Diff line number Diff line change
Expand Up @@ -706,20 +706,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',
Expand Down

0 comments on commit 8503927

Please sign in to comment.