Add support to set nhori (#410)

Author: stelliom

docs/index.md

@@ -55,6 +55,7 @@ _1. EXTPAR settings as JSON, see official docs_
     "lfilter_oro": false,
     "lurban": false,
     "lradtopo": true,
+    "nhori": 24,
     "radtopo_radius": 40000
   }
 }

python/WrapExtpar.py

@@ -81,14 +81,15 @@ def main():
     lfilter_oro = config.get('lfilter_oro', False)
     lurban = config.get('lurban', False)
     lradtopo = config.get('lradtopo', False)
+    nhori = config.get('nhori', 24)
     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, enable_art, use_array_cache, radtopo_radius,
-        args.raw_data_path, args.run_dir, args.account, args.host,
-        args.no_batch_job, lurban, lsgsl, lfilter_oro, lradtopo)
+        enable_cdnc, enable_edgar, enable_art, use_array_cache, nhori,
+        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,
@@ -105,6 +106,7 @@ def generate_external_parameters(igrid_type,
                                  enable_edgar,
                                  enable_art,
                                  use_array_cache,
+                                 nhori,
                                  radtopo_radius,
                                  raw_data_path,
                                  run_dir,
@@ -140,6 +142,7 @@ def generate_external_parameters(igrid_type,
         'enable_art': enable_art,
         'use_array_cache': use_array_cache,
         'lradtopo': lradtopo,
+        'nhori': nhori,
         'radtopo_radius': radtopo_radius,
         'lsgsl': lsgsl,
         'lfilter_oro': lfilter_oro,
@@ -362,7 +365,7 @@ def setup_oro_namelist_cosmo(args):
     namelist.update(orography_smoothing_params())
 
     # &radtopo
-    namelist['nhori'] = 24
+    namelist['nhori'] = args['nhori']
     if args['lradtopo']:
         namelist['lradtopo'] = ".TRUE."
     else:
@@ -466,7 +469,7 @@ def setup_oro_namelist_icon(args, lonmax, lonmin, latmax, latmin):
         namelist['lradtopo'] = ".FALSE."
 
     # only relevant if lradtopo=.TRUE., but needed for namelist
-    namelist['nhori'] = 24
+    namelist['nhori'] = args['nhori']
     namelist['max_missing'] = 0.95
     namelist['min_circ_cov'] = 1
     namelist['radius'] = args['radtopo_radius']

test/pytest/test_wrap_extpar.py

@@ -679,6 +679,7 @@ def test_setup_oro_namelist_icon_globe():
         'itopo_type': 1,
         'raw_data_path': '/path/to/raw/data',
         'lradtopo': False,
+        'nhori': 24,
         'radtopo_radius': 40000.0
     }
     lonmax, lonmin, latmax, latmin = 180.0, -180.0, 90.0, -90.0
@@ -765,6 +766,7 @@ def test_setup_oro_namelist_icon_merit_lradtopo():
         'itopo_type': 3,
         'raw_data_path': '/path/to/raw/data',
         'lradtopo': True,
+        'nhori': 24,
         'radtopo_radius': 60000.0
     }
     lonmax = 30.0
@@ -898,6 +900,7 @@ def test_all_placeholders_replaced_cosmo(tmp_dir):
         "enable_art": False,
         'tile_mode': 0,
         "use_array_cache": False,
+        "nhori": 24,
         "radtopo_radius": 40000.0,
         "raw_data_path": '/dummy/raw_data_path',
         "run_dir": str(tmp_dir),
@@ -934,6 +937,7 @@ def test_all_placeholders_replaced_icon(tmp_dir, icon_grid):
         "enable_art": False,
         'tile_mode': 1,
         "use_array_cache": False,
+        "nhori": 24,
         "radtopo_radius": 40000.0,
         "raw_data_path": '/dummy/raw_data_path',
         "run_dir": str(tmp_dir),