From 1ae7e921fd419a924ef797dc7a22e6b6c1bc540a Mon Sep 17 00:00:00 2001 From: Dongqi-DQ Date: Thu, 21 Dec 2023 11:55:41 +1300 Subject: [PATCH] correct LAI input variable name --- JOBS/Berlin_DLR/INPUT/config.static-Berlin_DLR | 2 +- JOBS/Chch_online/INPUT/config.static-Chch_online | 2 +- run_config_static.py | 6 +++--- util/create_static.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/JOBS/Berlin_DLR/INPUT/config.static-Berlin_DLR b/JOBS/Berlin_DLR/INPUT/config.static-Berlin_DLR index 1e8262d..171832b 100644 --- a/JOBS/Berlin_DLR/INPUT/config.static-Berlin_DLR +++ b/JOBS/Berlin_DLR/INPUT/config.static-Berlin_DLR @@ -46,6 +46,6 @@ pavement = "", "Berlin_pavement_type_2m_DLR.tif", "Berlin_pavement_type_2m_DLR. street = "", "Berlin_street_type_2m_DLR.tif", "Berlin_street_type_2m_DLR.tif", [plant] -tree_lad_max = 5.0, 5.0, 5.0, +tree_lai_max = 5.0, 5.0, 5.0, lad_max_height = 0.4, 0.4, 0.4, sfch = "","Berlin_vegetation_patch_height_2m_DLR.tif", "Berlin_vegetation_patch_height_2m_DLR.tif", diff --git a/JOBS/Chch_online/INPUT/config.static-Chch_online b/JOBS/Chch_online/INPUT/config.static-Chch_online index d43bb17..401bf99 100644 --- a/JOBS/Chch_online/INPUT/config.static-Chch_online +++ b/JOBS/Chch_online/INPUT/config.static-Chch_online @@ -48,7 +48,7 @@ pavement = "", "osm", "osm", street = "", "osm", "osm", [plant] -tree_lad_max = 5.0, 5.0, 5.0, +tree_lai_max = 5.0, 5.0, 5.0, lad_max_height = 0.4, 0.4, 0.4, sfch = "","","", "", diff --git a/run_config_static.py b/run_config_static.py index c527c79..acdcdee 100644 --- a/run_config_static.py +++ b/run_config_static.py @@ -112,7 +112,7 @@ street = ast.literal_eval(config.get("urban", "street")) ## [tif files for plant canopy] -tree_lad_max = ast.literal_eval(config.get("plant", "tree_lad_max")) +tree_lai_max = ast.literal_eval(config.get("plant", "tree_lai_max")) lad_max_height = ast.literal_eval(config.get("plant", "lad_max_height")) sfch = ast.literal_eval(config.get("plant", "sfch")) @@ -157,7 +157,7 @@ 'ny': ny[i], 'nz': nz[i], 'z_origin': z_origin[i], - 'tree_lad_max': tree_lad_max[i], + 'tree_lai_max': tree_lai_max[i], 'lad_max_height': lad_max_height[i], 'water_temperature_file': water[i], 'water_temperature_default': water_temperature_default[i], @@ -251,7 +251,7 @@ 'ny': ny[i], 'nz': nz[i], 'z_origin': z_origin[i], - 'tree_lad_max': tree_lad_max[i], + 'tree_lai_max': tree_lai_max[i], 'lad_max_height': lad_max_height[i], 'water_temperature_file': water[i], 'water_temperature_default': water_temperature_default[i], diff --git a/util/create_static.py b/util/create_static.py index 9780eb8..0c8587c 100755 --- a/util/create_static.py +++ b/util/create_static.py @@ -117,7 +117,7 @@ def generate_palm_static(case_name, tmp_path, idomain, config_proj, dom_dict): lu_csv_file = dom_dict["lu_csv_file"] ### leaf area index parameters - tree_lad_max = dom_dict['tree_lad_max'] # default value 5.0 + tree_lai_max = dom_dict['tree_lai_max'] # default value 5.0 lad_max_height = dom_dict['lad_max_height'] # default value 0.4 ## water input file options @@ -360,7 +360,7 @@ def generate_palm_static(case_name, tmp_path, idomain, config_proj, dom_dict): continue else: # Calculate height of maximum LAD - tree_lai_scaled = tree_lad_max* tree_height[idy, idx]/scale_height + tree_lai_scaled = tree_lai_max* tree_height[idy, idx]/scale_height z_lad_max = lad_max_height * tree_height[idy, idx] # Calculate the maximum LAD after Lalic and Mihailovic (2004)