Made ilookup_table_lu selectable

Author: stelliom

docs/index.md

@@ -47,6 +47,7 @@ _1. EXTPAR settings as JSON, see official docs_
     "it_cl_type": 1,
     "iera_type": 1,
     "iemiss_type": 1,
+    "ilookup_table_lu": 1,
     "enable_cdnc": false,
     "enable_edgar": false,
     "enable_art": false,

python/WrapExtpar.py

@@ -73,6 +73,7 @@ def main():
     it_cl_type = config.get('it_cl_type')
     iera_type = config.get('iera_type')
     iemiss_type = config.get('iemiss_type')
+    ilookup_table_lu = config.get('ilookup_table_lu')
     enable_cdnc = config.get('enable_cdnc', False)
     enable_edgar = config.get('enable_edgar', False)
     enable_art = config.get('enable_art', False)
@@ -88,10 +89,10 @@ def main():
     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, nhori,
-        radtopo_radius, args.raw_data_path, args.run_dir, args.account,
-        args.host, args.no_batch_job, lurban, lsgsl, lfilter_oro, l_use_corine,
-        lradtopo)
+        ilookup_table_lu, 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, l_use_corine, lradtopo)
 
 
 def generate_external_parameters(igrid_type,
@@ -104,6 +105,7 @@ def generate_external_parameters(igrid_type,
                                  it_cl_type,
                                  iera_type,
                                  iemiss_type,
+                                 ilookup_table_lu,
                                  enable_cdnc,
                                  enable_edgar,
                                  enable_art,
@@ -140,6 +142,7 @@ def generate_external_parameters(igrid_type,
         'it_cl_type': it_cl_type,
         'iera_type': iera_type,
         'iemiss_type': iemiss_type,
+        'ilookup_table_lu': ilookup_table_lu,
         'enable_cdnc': enable_cdnc,
         'enable_edgar': enable_edgar,
         'enable_art': enable_art,
@@ -493,7 +496,7 @@ def generate_globe_filenames():
 def setup_lu_namelist(args):
     namelist = {}
     namelist['i_landuse_data'] = args['ilu_type']
-    namelist['ilookup_table_lu'] = args['ilu_type']
+    namelist['ilookup_table_lu'] = args['ilookup_table_lu']
     namelist['raw_data_lu_path'] = args['raw_data_path']
     namelist['raw_data_glcc_path'] = args['raw_data_path']
     namelist['lu_buffer_file'] = 'lu_buffer.nc'

test/pytest/test_wrap_extpar.py

@@ -217,7 +217,8 @@ def test_setup_lu_namelist_type_1():
     args = {
         'ilu_type': 1,
         'raw_data_path': '/path/to/data',
-        'l_use_corine': False
+        'l_use_corine': False,
+        'ilookup_table_lu': 1
     }
     expected_namelist = {
         'i_landuse_data':
@@ -253,7 +254,8 @@ def test_setup_lu_namelist_corine():
     args = {
         'ilu_type': 1,
         'raw_data_path': '/path/to/data',
-        'l_use_corine': True
+        'l_use_corine': True,
+        'ilookup_table_lu': 1
     }
     expected_namelist = {
         'i_landuse_data': 1,
@@ -275,7 +277,8 @@ def test_setup_lu_namelist_type_2():
     args = {
         'ilu_type': 2,
         'raw_data_path': '/path/to/data',
-        'l_use_corine': False
+        'l_use_corine': False,
+        'ilookup_table_lu': 2
     }
     expected_namelist = {
         'i_landuse_data': 2,
@@ -297,11 +300,12 @@ def test_setup_lu_namelist_type_6():
     args = {
         'ilu_type': 6,
         'raw_data_path': '/path/to/data',
-        'l_use_corine': False
+        'l_use_corine': False,
+        'ilookup_table_lu': 1
     }
     expected_namelist = {
         'i_landuse_data': 6,
-        'ilookup_table_lu': 6,
+        'ilookup_table_lu': 1,
         'raw_data_lu_path': '/path/to/data',
         'raw_data_glcc_path': '/path/to/data',
         'lu_buffer_file': 'lu_buffer.nc',