From e8f3a1c6eeb2a3cbffadef61153baa0fd118ee67 Mon Sep 17 00:00:00 2001 From: vagudets Date: Thu, 25 Apr 2024 14:32:02 +0200 Subject: [PATCH 1/3] Update bsc32* to bsc032* --- autosubmit/conf_esarchive/platforms.yml | 2 +- conf/autosubmit.yml | 2 +- recipes/examples/recipe_decadal_split.yml | 2 +- recipes/examples/recipe_ecvs_seasonal_oper.yml | 2 +- recipes/examples/recipe_scorecards.yml | 2 +- recipes/recipe_multimodel_decadal.yml | 2 +- recipes/tests/recipe_autosubmit_marstest.yml | 2 +- recipes/tests/recipe_multiregion.yml | 2 +- recipes/tests/recipe_seasonal_vizNA.yml | 2 +- tools/check_recipe.R | 4 ++-- use_cases/ex1_2_autosubmit_scorecards/ex1_2-handson.md | 2 +- use_cases/ex1_2_autosubmit_scorecards/ex1_2-recipe.yml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/autosubmit/conf_esarchive/platforms.yml b/autosubmit/conf_esarchive/platforms.yml index 78056d62..fb01d5ba 100644 --- a/autosubmit/conf_esarchive/platforms.yml +++ b/autosubmit/conf_esarchive/platforms.yml @@ -4,7 +4,7 @@ Platforms: TYPE: slurm HOST: nord4.bsc.es USER: - PROJECT: bsc32 ## TO BE CHANGED + PROJECT: bsc032 ## TO BE CHANGED SCRATCH_DIR: /gpfs/scratch/ ## TO BE CHANGED PROCESSORS_PER_NODE: 16 SERIAL_QUEUE: debug diff --git a/conf/autosubmit.yml b/conf/autosubmit.yml index 3e3f1220..25872a0e 100644 --- a/conf/autosubmit.yml +++ b/conf/autosubmit.yml @@ -4,7 +4,7 @@ esarchive: auto_version: 4.0.98 conf_format: yaml experiment_dir: /esarchive/autosubmit/ - userID: bsc32 + userID: bsc032 mars: platform: NORD3 ## TO BE CHANGED module_version: autosubmit/4.0.0b-foss-2015a-Python-3.7.3 ## TO BE CHANGED diff --git a/recipes/examples/recipe_decadal_split.yml b/recipes/examples/recipe_decadal_split.yml index 70764027..ce07171f 100644 --- a/recipes/examples/recipe_decadal_split.yml +++ b/recipes/examples/recipe_decadal_split.yml @@ -58,7 +58,7 @@ Run: auto_conf: script: /esarchive/scratch/cdelgado/gitlab/cdelgado_copernicus/ESS_evaluation_tool/main_decadal.R expid: a5tx ## if left empty, create new exp? - hpc_user: bsc32924 # your hpc username + hpc_user: bsc032924 # your hpc username wallclock: 01:00 # hh:mm processors_per_job: 8 # use ncores parameter? platform: nord3v2 # make this constant? diff --git a/recipes/examples/recipe_ecvs_seasonal_oper.yml b/recipes/examples/recipe_ecvs_seasonal_oper.yml index 832f36d5..6b7e48c1 100644 --- a/recipes/examples/recipe_ecvs_seasonal_oper.yml +++ b/recipes/examples/recipe_ecvs_seasonal_oper.yml @@ -63,7 +63,7 @@ Run: auto_conf: script: /esarchive/scratch/nperez/git/auto-s2s/exec_ecvs_seasonal_oper.R # replace with the path to your script expid: a68v # replace with your EXPID - hpc_user: bsc32339 # replace with your hpc username + hpc_user: bsc032339 # replace with your hpc username wallclock: 02:00 # hh:mm processors_per_job: 4 platform: nord3v2 diff --git a/recipes/examples/recipe_scorecards.yml b/recipes/examples/recipe_scorecards.yml index a75ad1d2..aee30aa8 100644 --- a/recipes/examples/recipe_scorecards.yml +++ b/recipes/examples/recipe_scorecards.yml @@ -108,7 +108,7 @@ Run: auto_conf: script: /esarchive/scratch/nmilders/gitlab/git_clones/s2s-suite/execute_scorecards_data_loading.R # replace with the path to your script expid: a6a3 # replace with your EXPID - hpc_user: bsc32878 # replace with your hpc username + hpc_user: bsc032878 # replace with your hpc username wallclock: 03:00 # hh:mm processors_per_job: 8 platform: nord3v2 diff --git a/recipes/recipe_multimodel_decadal.yml b/recipes/recipe_multimodel_decadal.yml index ce2530e8..ea293e76 100644 --- a/recipes/recipe_multimodel_decadal.yml +++ b/recipes/recipe_multimodel_decadal.yml @@ -64,7 +64,7 @@ Run: auto_conf: script: /esarchive/scratch/cdelgado/gitlat/SUNSET/main_multimodel_seasonal.R # replace with the path to your script expid: XXXX # replace with your EXPID - hpc_user: bsc32924 # replace with your hpc username + hpc_user: bsc032924 # replace with your hpc username wallclock: 02:00 # hh:mm processors_per_job: 4 platform: nord3v2 diff --git a/recipes/tests/recipe_autosubmit_marstest.yml b/recipes/tests/recipe_autosubmit_marstest.yml index 24b90797..5189c534 100644 --- a/recipes/tests/recipe_autosubmit_marstest.yml +++ b/recipes/tests/recipe_autosubmit_marstest.yml @@ -71,7 +71,7 @@ Run: auto_conf: script: /esarchive/scratch/vagudets/repos/auto-s2s/example_scripts/test_parallel_workflow.R # path to the script to run expid: a5ta ## if left empty, create new exp? - hpc_user: bsc32762 # your hpc username + hpc_user: bsc032762 # your hpc username wallclock: 02:30 # hh:mm processors_per_job: 14 # use ncores parameter? platform: nord3v2 # make this constant? diff --git a/recipes/tests/recipe_multiregion.yml b/recipes/tests/recipe_multiregion.yml index 91139523..7c6d16d5 100644 --- a/recipes/tests/recipe_multiregion.yml +++ b/recipes/tests/recipe_multiregion.yml @@ -72,7 +72,7 @@ Run: auto_conf: script: /esarchive/scratch/vagudets/repos/auto-s2s/example_scripts/test_parallel_workflow.R expid: a5no # autosubmit experiment ID - hpc_user: bsc32762 # your hpc username + hpc_user: bsc032762 # your hpc username wallclock: 04:00 # hh:mm processors_per_job: 8 # use ncores parameter? platform: nord3v2 # make this constant? diff --git a/recipes/tests/recipe_seasonal_vizNA.yml b/recipes/tests/recipe_seasonal_vizNA.yml index fac86933..32160eba 100644 --- a/recipes/tests/recipe_seasonal_vizNA.yml +++ b/recipes/tests/recipe_seasonal_vizNA.yml @@ -75,7 +75,7 @@ Run: auto_conf: script: /esarchive/scratch/vagudets/repos/auto-s2s/example_scripts/test_parallel_workflow.R expid: # autosubmit experiment ID - hpc_user: bsc32762 # your hpc username + hpc_user: bsc032762 # your hpc username wallclock: 04:00 # hh:mm processors_per_job: 8 # use ncores parameter? platform: nord3v2 # make this constant? diff --git a/tools/check_recipe.R b/tools/check_recipe.R index 42cb832c..e4249915 100644 --- a/tools/check_recipe.R +++ b/tools/check_recipe.R @@ -806,9 +806,9 @@ check_recipe <- function(recipe) { "The 'Run:auto_conf:hpc_user' field can not be empty.") error_status <- TRUE } else if ((recipe$Run$filesystem == "esarchive") && - (!substr(recipe$Run$auto_conf$hpc_user, 1, 5) == "bsc32")) { + (!substr(recipe$Run$auto_conf$hpc_user, 1, 5) == "bsc032")) { error(recipe$Run$logger, - "Please check your hpc_user ID. It should look like: 'bsc32xxx'") + "Please check your hpc_user ID. It should look like: 'bsc032xxx'") error_status <- TRUE } # Multimodel-specific parameters diff --git a/use_cases/ex1_2_autosubmit_scorecards/ex1_2-handson.md b/use_cases/ex1_2_autosubmit_scorecards/ex1_2-handson.md index c77fb2b1..416d00d7 100644 --- a/use_cases/ex1_2_autosubmit_scorecards/ex1_2-handson.md +++ b/use_cases/ex1_2_autosubmit_scorecards/ex1_2-handson.md @@ -58,7 +58,7 @@ You should at least edit some items in the "Run" section: - `code_dir`: The directory where your SUNSET code is stored (i.e., the git folder) - `auto_conf$script`: The path to the script ex1_2-recipe.yml - `auto_conf$expid`: The experiment "xxxx" you just created -- `auto_conf$hpc_user`: You user ID on Nord3, which should be bsc32xxx +- `auto_conf$hpc_user`: You user ID on Nord3, which should be bsc032xxx - `auto_conf$email_address`: Your email. You can also adjust other email notification parts up to your preference. In the recipe, we ask for anomaly calculation after loading the data, calculate the skill scores and save the result for scorecards. In the Scorecard section, three regions are requested. diff --git a/use_cases/ex1_2_autosubmit_scorecards/ex1_2-recipe.yml b/use_cases/ex1_2_autosubmit_scorecards/ex1_2-recipe.yml index 73f16311..8e1204bf 100644 --- a/use_cases/ex1_2_autosubmit_scorecards/ex1_2-recipe.yml +++ b/use_cases/ex1_2_autosubmit_scorecards/ex1_2-recipe.yml @@ -83,7 +83,7 @@ Run: auto_conf: script: /esarchive/scratch/aho/git/auto-s2s/use_cases/ex1_2_autosubmit_scorecards/ex1_2-script.R # replace with the path to your script expid: a6pc # replace with your EXPID - hpc_user: bsc32734 # replace with your hpc username + hpc_user: bsc032734 # replace with your hpc username wallclock: 03:00 # hh:mm processors_per_job: 8 platform: nord3v2 -- GitLab From b63599bb3b6a0ad854457e04bae630588e0e2a8a Mon Sep 17 00:00:00 2001 From: vagudets Date: Mon, 29 Apr 2024 16:47:09 +0200 Subject: [PATCH 2/3] Change platform project folder back to bsc32 --- autosubmit/conf_esarchive/platforms.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autosubmit/conf_esarchive/platforms.yml b/autosubmit/conf_esarchive/platforms.yml index fb01d5ba..78056d62 100644 --- a/autosubmit/conf_esarchive/platforms.yml +++ b/autosubmit/conf_esarchive/platforms.yml @@ -4,7 +4,7 @@ Platforms: TYPE: slurm HOST: nord4.bsc.es USER: - PROJECT: bsc032 ## TO BE CHANGED + PROJECT: bsc32 ## TO BE CHANGED SCRATCH_DIR: /gpfs/scratch/ ## TO BE CHANGED PROCESSORS_PER_NODE: 16 SERIAL_QUEUE: debug -- GitLab From be52baaf8bc7cfbe69b6b2dd8fdeb4a5866a29a8 Mon Sep 17 00:00:00 2001 From: vagudets Date: Mon, 29 Apr 2024 17:01:29 +0200 Subject: [PATCH 3/3] Bugfix: correct bsc32 username check --- tools/check_recipe.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/check_recipe.R b/tools/check_recipe.R index e4249915..c0d2f9cd 100644 --- a/tools/check_recipe.R +++ b/tools/check_recipe.R @@ -806,7 +806,7 @@ check_recipe <- function(recipe) { "The 'Run:auto_conf:hpc_user' field can not be empty.") error_status <- TRUE } else if ((recipe$Run$filesystem == "esarchive") && - (!substr(recipe$Run$auto_conf$hpc_user, 1, 5) == "bsc032")) { + (!substr(recipe$Run$auto_conf$hpc_user, 1, 6) == "bsc032")) { error(recipe$Run$logger, "Please check your hpc_user ID. It should look like: 'bsc032xxx'") error_status <- TRUE -- GitLab