From 48a97e7d775d16cc6cfa6f5eadf06e47024c428f Mon Sep 17 00:00:00 2001 From: Laszlo H Hajdu Date: Thu, 16 Jan 2025 15:36:21 +0100 Subject: [PATCH] potential issue in esm_tools naming --- configs/components/lpj_guess/lpj_guess.yaml | 16 ++++++----- configs/components/oifs/oifs.yaml | 3 +- configs/setups/awiesm3/awiesm3.yaml | 28 ++++++++++++------- ...wiesm3-v3.4-levante-TCO95L91-CORE2_1y.yaml | 19 ++++++------- 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/configs/components/lpj_guess/lpj_guess.yaml b/configs/components/lpj_guess/lpj_guess.yaml index 70354bfc0..ea56605d7 100644 --- a/configs/components/lpj_guess/lpj_guess.yaml +++ b/configs/components/lpj_guess/lpj_guess.yaml @@ -46,16 +46,17 @@ choose_version: runscript_name: run_coupled_4_1_2.ins git-repository: https://git.smhi.se/marlin/ec-earth-4-lpjgv-4-p-1-novelty.git branch: compiles_with_oasis_and_netcdf_on_levante - model_dir: ${general.model_dir}/sources/LPJ-GUESS-lpjg_v4p1/ + model_dir: ${general.model_dir}/sources/LPJ-GUESS-lpjg_v4p1/ #temporarily commented out wrong model_dir? + #model_dir: ${general.model_dir}/lpj_guess/sources/LPJ-GUESS-lpjg_v4p1/ destination: lpj_guess - mygrid: T159 - install_bins: sources/LPJ-GUESS-lpjg_v4p1/build/guess_T159 - executable: guess_T159 + mygrid: TL159 + install_bins: sources/LPJ-GUESS-lpjg_v4p1/build/guess_TL159 + executable: guess_TL159 environment_changes: add_add_add_add_add_export_vars: myfortrancompiler: $FC - mygrid: T159 + mygrid: TL159 OASIS_ANCHOR: ../../../oasis NETCDF_C_DIR: $NETCDFROOT NETCDF_F_DIR: $NETCDFFROOT @@ -85,8 +86,9 @@ namelist_dir: ${general.esm_namelist_dir}/lpj_guess/ gridlist_dir: ${input_dir}/gridlists/ forcing_dir: ${input_dir}/climate_forcing_data/ -gridlist: "full_global" # sets up grid cell list =/ setup_name!! -setup_name: "global" # sets up all the model parameters +#gridlist: "full_global" # sets up grid cell list =/ setup_name!! +gridlist: "home" # sets up grid cell list =/ setup_name!! +setup_name: global # sets up all the model parameters # File dictionaries to control the copying/moving/linking of all files associated to diff --git a/configs/components/oifs/oifs.yaml b/configs/components/oifs/oifs.yaml index a714d496e..16a30e939 100644 --- a/configs/components/oifs/oifs.yaml +++ b/configs/components/oifs/oifs.yaml @@ -276,7 +276,8 @@ choose_version: - xios-2.5_r1910_oifs major_version: 43r3 48r1: - branch: 'dev/integrate-with-ece4' + #branch: 'dev/integrate-with-ece4' + branch: 'LPJ-Guess' # --build-type Debug comp_command: "./openifs-bundle create; ./openifs-bundle build --threads=32 --openifs-only --without-double-precision --install; chmod -R ${source_code_permissions} .; mv install/bin/ifsMASTER.SP install/bin/OpenIFS" clean_command: rm -rf build diff --git a/configs/setups/awiesm3/awiesm3.yaml b/configs/setups/awiesm3/awiesm3.yaml index 89ea6a03a..9cc8b2bdc 100644 --- a/configs/setups/awiesm3/awiesm3.yaml +++ b/configs/setups/awiesm3/awiesm3.yaml @@ -288,7 +288,7 @@ lpj_guess: coupling_fields: "[[veg_atm_fields-->FIELD]]": - grid: lpjg + grid: ${lpj_guess.mygrid}-land grids: lpjg: name: lpjg @@ -297,18 +297,26 @@ lpj_guess: oasis_grid_type: "D" oyac_grid_type: "LL" oyac_io_per_node: 4 + TL159-land: + name: TL159-land + nx: "${nx}" + ny: "${ny}" + oasis_grid_type: "D" + oyac_grid_type: "LL" + oyac_io_per_node: 4 choose_general.major_version: "v3.4": version: "4.1.2" - -forcing_sources: - soil_layer_type: ${input_dir}/slt/slt_${mgrid}.nc - CO2: ${input_dir}/cmip6_forcing/mole_fraction_of_carbon_dioxide_in_air_input4MIPs_lpjg.nc - tmp_rc_file: ${input_dir}/lpjg_steps.rc -forcing_in_work: - soil_layer_type: slt_${mgrid}.nc - CO2: mole_fraction_of_carbon_dioxide_in_air_input4MIPs_lpjg.nc - tmp_rc_file: lpjg_steps.rc + + forcing_sources: + soil_layer_type: ${lpj_guess.input_dir}/slt/slt_${mygrid}.nc + tmp_rc_file: ${lpj_guess.input_dir}/lpjg_steps.rc + CO2: ${lpj_guess.input_dir}/cmip6_forcing/mole_fraction_of_carbon_dioxide_in_air_input4MIPs_lpjg.nc + + forcing_in_work: + soil_layer_type: slt_${mygrid}.nc + tmp_rc_file: lpjg_steps.rc + CO2: mole_fraction_of_carbon_dioxide_in_air_input4MIPs_lpjg.nc xios: choose_general.version: diff --git a/runscripts/awiesm3/v3.4/awiesm3-v3.4-levante-TCO95L91-CORE2_1y.yaml b/runscripts/awiesm3/v3.4/awiesm3-v3.4-levante-TCO95L91-CORE2_1y.yaml index c51adb142..d605eab63 100644 --- a/runscripts/awiesm3/v3.4/awiesm3-v3.4-levante-TCO95L91-CORE2_1y.yaml +++ b/runscripts/awiesm3/v3.4/awiesm3-v3.4-levante-TCO95L91-CORE2_1y.yaml @@ -2,10 +2,10 @@ general: user: !ENV ${USER} setup_name: "awiesm3" version: "v3.4" - account: "ba0989" - compute_time: "01:00:00" + account: "ab0995" + compute_time: "00:20:00" initial_date: "2000-01-01" - final_date: "2020-01-01" + final_date: "2001-01-01" base_dir: "/work/ab0995/${user}/runtime/${general.setup_name}-${general.version}/" nday: 0 nmonth: 0 @@ -25,14 +25,15 @@ fesom: restart_first: 1 lresume: false time_step: 1800 - nproc: 768 + nproc: 128 tar_binary_restarts: true - namelist_dir: "/work/ab0995/a270092/model_codes/awicm3-v3.4/fesom-2.6/config/" + namelist_dir: "/work/ab0995/a270270/model_codes/awiesm3-v3.4/fesom-2.6/config" lpj_guess: resolution: "TL159" lresume: false - + nproc: 128 + omp_num_threads: 1 oifs: resolution: "TL159" @@ -42,8 +43,8 @@ oifs: wam: true lresume: false time_step: 3600 - nproc: 384 - omp_num_threads: 4 + nproc: 128 + omp_num_threads: 1 oasis3mct: use_lucia: True @@ -54,5 +55,3 @@ xios: with_model: oifs nproc: 4 omp_num_threads: 32 - -