From 47541e59553e1e6ef6977a85c7fdea2e0fb7126d Mon Sep 17 00:00:00 2001 From: Guillaume Vernieres Date: Fri, 14 Jul 2023 12:38:52 -0400 Subject: [PATCH] switch qos to batch --- test/atm/global-workflow/jjob_ens_final.sh | 2 +- test/atm/global-workflow/jjob_ens_init.sh | 2 +- test/atm/global-workflow/jjob_ens_run.sh | 2 +- test/atm/global-workflow/jjob_var_final.sh | 2 +- test/atm/global-workflow/jjob_var_init.sh | 2 +- test/atm/global-workflow/jjob_var_run.sh | 2 +- test/atm/global-workflow/run_jedi_exe_3denvar.sh | 4 ++-- test/atm/global-workflow/run_jedi_exe_3dhofx.sh | 4 ++-- test/atm/global-workflow/run_jedi_exe_3dvar.sh | 4 ++-- test/atm/global-workflow/run_jedi_exe_letkf.sh | 4 ++-- test/soca/gw/CMakeLists.txt | 2 +- test/soca/gw/run_gdas_apps.yaml.test | 2 +- test/soca/gw/run_jjobs.yaml.test | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/atm/global-workflow/jjob_ens_final.sh b/test/atm/global-workflow/jjob_ens_final.sh index 8296fb29a..b1aaa11e7 100755 --- a/test/atm/global-workflow/jjob_ens_final.sh +++ b/test/atm/global-workflow/jjob_ens_final.sh @@ -46,7 +46,7 @@ fi # Execute j-job if [ $machine = 'HERA' -o $machine = 'ORION' ]; then - sbatch --ntasks=1 --account=$ACCOUNT --qos=debug --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE + sbatch --ntasks=1 --account=$ACCOUNT --qos=batch --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE else ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_FINALIZE fi diff --git a/test/atm/global-workflow/jjob_ens_init.sh b/test/atm/global-workflow/jjob_ens_init.sh index fbeabd5f7..0e2991a14 100755 --- a/test/atm/global-workflow/jjob_ens_init.sh +++ b/test/atm/global-workflow/jjob_ens_init.sh @@ -105,7 +105,7 @@ done # Execute j-job if [ $machine = 'HERA' -o $machine = 'ORION' ]; then - sbatch --ntasks=1 --account=$ACCOUNT --qos=debug --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE + sbatch --ntasks=1 --account=$ACCOUNT --qos=batch --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE else ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE fi diff --git a/test/atm/global-workflow/jjob_ens_run.sh b/test/atm/global-workflow/jjob_ens_run.sh index 56e384f79..4eb89b035 100755 --- a/test/atm/global-workflow/jjob_ens_run.sh +++ b/test/atm/global-workflow/jjob_ens_run.sh @@ -49,7 +49,7 @@ fi # Execute j-job if [ $machine = 'HERA' -o $machine = 'ORION' ]; then - sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=debug --time=00:30:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_RUN + sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=batch --time=00:30:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_RUN else ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_RUN fi diff --git a/test/atm/global-workflow/jjob_var_final.sh b/test/atm/global-workflow/jjob_var_final.sh index fa03cc927..a65124828 100755 --- a/test/atm/global-workflow/jjob_var_final.sh +++ b/test/atm/global-workflow/jjob_var_final.sh @@ -46,7 +46,7 @@ fi # Execute j-job if [ $machine = 'HERA' -o $machine = 'ORION' ]; then - sbatch --ntasks=1 --account=$ACCOUNT --qos=debug --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE + sbatch --ntasks=1 --account=$ACCOUNT --qos=batch --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE else ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_FINALIZE fi diff --git a/test/atm/global-workflow/jjob_var_init.sh b/test/atm/global-workflow/jjob_var_init.sh index 2bd4ce637..a364e6c34 100755 --- a/test/atm/global-workflow/jjob_var_init.sh +++ b/test/atm/global-workflow/jjob_var_init.sh @@ -102,7 +102,7 @@ done # Execute j-job if [ $machine = 'HERA' -o $machine = 'ORION' ]; then - sbatch --ntasks=1 --account=$ACCOUNT --qos=debug --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE + sbatch --ntasks=1 --account=$ACCOUNT --qos=batch --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE else ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_INITIALIZE fi diff --git a/test/atm/global-workflow/jjob_var_run.sh b/test/atm/global-workflow/jjob_var_run.sh index 200fdd1b2..05e861210 100755 --- a/test/atm/global-workflow/jjob_var_run.sh +++ b/test/atm/global-workflow/jjob_var_run.sh @@ -49,7 +49,7 @@ fi # Execute j-job if [ $machine = 'HERA' -o $machine = 'ORION' ]; then - sbatch --ntasks=6 --account=$ACCOUNT --qos=debug --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_RUN + sbatch --ntasks=6 --account=$ACCOUNT --qos=batch --time=00:10:00 --export=ALL --wait ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_RUN else ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_RUN fi diff --git a/test/atm/global-workflow/run_jedi_exe_3denvar.sh b/test/atm/global-workflow/run_jedi_exe_3denvar.sh index 3e94394de..e5e3ff3d6 100755 --- a/test/atm/global-workflow/run_jedi_exe_3denvar.sh +++ b/test/atm/global-workflow/run_jedi_exe_3denvar.sh @@ -26,7 +26,7 @@ if [ "$machine" = "hera" ] ; then partition="hera" gdasfix="/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix" elif [ "$machine" = "orion" ]; then - partition="debug" + partition="batch" gdasfix="/work2/noaa/da/cmartin/GDASApp/fix" fi @@ -75,7 +75,7 @@ config: job options: machine: ${machine} account: da-cpu - queue: debug + queue: batch partition: ${partition} walltime: '30:00' ntasks: 6 diff --git a/test/atm/global-workflow/run_jedi_exe_3dhofx.sh b/test/atm/global-workflow/run_jedi_exe_3dhofx.sh index fb1a6a99e..eb64c3997 100755 --- a/test/atm/global-workflow/run_jedi_exe_3dhofx.sh +++ b/test/atm/global-workflow/run_jedi_exe_3dhofx.sh @@ -26,7 +26,7 @@ if [ "$machine" = "hera" ] ; then partition="hera" gdasfix="/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix" elif [ "$machine" = "orion" ]; then - partition="debug" + partition="batch" gdasfix="/work2/noaa/da/cmartin/GDASApp/fix" fi @@ -64,7 +64,7 @@ config: job options: machine: ${machine} account: da-cpu - queue: debug + queue: batch partition: ${partition} walltime: '30:00' ntasks: 36 diff --git a/test/atm/global-workflow/run_jedi_exe_3dvar.sh b/test/atm/global-workflow/run_jedi_exe_3dvar.sh index 459f52121..ea8dd19f5 100755 --- a/test/atm/global-workflow/run_jedi_exe_3dvar.sh +++ b/test/atm/global-workflow/run_jedi_exe_3dvar.sh @@ -26,7 +26,7 @@ if [ "$machine" = "hera" ] ; then partition="hera" gdasfix="/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix" elif [ "$machine" = "orion" ]; then - partition="debug" + partition="batch" gdasfix="/work2/noaa/da/cmartin/GDASApp/fix" fi @@ -74,7 +74,7 @@ config: job options: machine: ${machine} account: da-cpu - queue: debug + queue: batch partition: ${partition} walltime: '30:00' ntasks: 6 diff --git a/test/atm/global-workflow/run_jedi_exe_letkf.sh b/test/atm/global-workflow/run_jedi_exe_letkf.sh index d507af5b6..a98a3236d 100755 --- a/test/atm/global-workflow/run_jedi_exe_letkf.sh +++ b/test/atm/global-workflow/run_jedi_exe_letkf.sh @@ -26,7 +26,7 @@ if [ "$machine" = "hera" ] ; then partition="hera" gdasfix="/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix" elif [ "$machine" = "orion" ]; then - partition="debug" + partition="batch" gdasfix="/work2/noaa/da/cmartin/GDASApp/fix" fi @@ -73,7 +73,7 @@ config: job options: machine: ${machine} account: da-cpu - queue: debug + queue: batch partition: ${partition} walltime: '30:00' ntasks: 36 diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt index 16664990b..a5022d4b3 100644 --- a/test/soca/gw/CMakeLists.txt +++ b/test/soca/gw/CMakeLists.txt @@ -14,7 +14,7 @@ add_test(NAME test_gdasapp_soca_prep set(MACHINE "container") IF (IS_DIRECTORY /work2/noaa/da) set(MACHINE "orion") - set(PARTITION "debug") + set(PARTITION "batch") ENDIF() IF (IS_DIRECTORY /scratch2/NCEPDEV/) set(MACHINE "hera") diff --git a/test/soca/gw/run_gdas_apps.yaml.test b/test/soca/gw/run_gdas_apps.yaml.test index 602b9471b..8b4cca66e 100644 --- a/test/soca/gw/run_gdas_apps.yaml.test +++ b/test/soca/gw/run_gdas_apps.yaml.test @@ -6,7 +6,7 @@ ctest command: job options: account: da-cpu - qos: debug + qos: batch output: @TEST@.out nodes: 1 ntasks: 1 diff --git a/test/soca/gw/run_jjobs.yaml.test b/test/soca/gw/run_jjobs.yaml.test index b619e8ccc..eaa6575ea 100644 --- a/test/soca/gw/run_jjobs.yaml.test +++ b/test/soca/gw/run_jjobs.yaml.test @@ -51,7 +51,7 @@ setup_expt config: job options: account: da-cpu - qos: debug + qos: batch output: @JJOB@.out nodes: 1 ntasks: 16