diff --git a/conf/autosubmit.yml b/conf/autosubmit.yml index 3e3f1220624a8e89767ed00caf5556ed5ba39003..25872a0ef510b95ebf0f8dbe911bf5a544d3d5ff 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 70764027b20671618ac8f9df64eb5e90679adeeb..ce07171f9e86c016fce20b3a952f85b59c7b26e4 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 832f36d54b04c688019b75b066dc41360b302288..6b7e48c1ac22e5c0eced06a610579b4f4ab88646 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 a75ad1d26bd368be33b288e0fb530faa62f6a833..aee30aa8c6925754a9e58eb1c59ffacde04748e9 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 ce2530e82794a0aeb00509f0d4c7ac1951d5d4a8..ea293e76c82412378b5a4eb6b5fa6893fc863b04 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 24b907977f3ac2fde7f0cea04bae35f91fb0d990..5189c5348712ad6225f6bc3c971b5184eb75c22c 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 91139523d261dbd9d0fe8363727c1b1385a8497f..7c6d16d54485d7f64a14ddc6cdaa6b6ee4c3c6de 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 fac86933b4046c1f49fe79d45917cb250fd6e507..32160eba6cdcd5ff933041ef1cf54b98c2729f74 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 42cb832c0fd5be6d2f64bc630308f5a7ec3ce705..c0d2f9cdf16ca622762e4ad0bae814ba9daaed93 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, 6) == "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 c77fb2b164a631c51dac51dd2a0f2ad90479d6bc..416d00d7f6efe3f27c51bfbd6685e5eaf4a6609c 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 73f16311f93cf69aa439945b00715b7d29f80afa..8e1204bf380c20159a9b22e5e97e1872649fbe07 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