From e7b2074713ea0bb374796a3d7861ef5cb22db4c9 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Tue, 17 Dec 2019 21:04:12 +0000 Subject: [PATCH 1/4] Change WCOSS account from FV3GFS to GFS-DEV --- NEMS | 2 +- tests/fv3_conf/fv3_bsub.IN_wcoss_cray | 2 +- tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3 | 2 +- tests/rt.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NEMS b/NEMS index 22be22b0ad..8248a782d7 160000 --- a/NEMS +++ b/NEMS @@ -1 +1 @@ -Subproject commit 22be22b0ad8836a6c8264075f79cbcca64ba74a7 +Subproject commit 8248a782d7193d41b773f6d90611c936e11e3c7f diff --git a/tests/fv3_conf/fv3_bsub.IN_wcoss_cray b/tests/fv3_conf/fv3_bsub.IN_wcoss_cray index a502b1e147..d06915d0f9 100644 --- a/tests/fv3_conf/fv3_bsub.IN_wcoss_cray +++ b/tests/fv3_conf/fv3_bsub.IN_wcoss_cray @@ -5,7 +5,7 @@ #BSUB -J @[JBNME] #BSUB -W 00:@[WLCLK] #BSUB -q @[QUEUE] -#BSUB -P FV3GFS-T2O +#BSUB -P GFS-DEV #BSUB -extsched "CRAYLINUX[]" -R "1*{select[craylinux && !vnode]} + @[TASKS]*{select[craylinux && vnode] span [ptile=@[TPN]]}" #BSUB -M 500 diff --git a/tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3 b/tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3 index 5f15f5008e..ba757f9a5c 100644 --- a/tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3 +++ b/tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3 @@ -5,7 +5,7 @@ #BSUB -J @[JBNME] #BSUB -W 00:@[WLCLK] #BSUB -q @[QUEUE] -#BSUB -P FV3GFS-T2O +#BSUB -P GFS-DEV #BSUB -n @[TASKS] #BSUB -R span[ptile=@[TPN]] #BSUB -R affinity[core(@[THRD])] diff --git a/tests/rt.sh b/tests/rt.sh index 2cbbe8406b..7f915aa2ab 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -144,7 +144,7 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then DISKNM=/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT QUEUE=debug PARTITION= - ACCNR=FV3GFS-T2O + ACCNR=GFS-DEV STMP=/gpfs/dell2/stmp PTMP=/gpfs/dell2/ptmp SCHEDULER=lsf From 6717a41e7efce9a4e410404b40a87794744d065f Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Tue, 17 Dec 2019 21:26:00 +0000 Subject: [PATCH 2/4] Add release/v0/exp/runjob_cray.sh to WCOSS acc change --- release/v0/exp/runjob_cray.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/v0/exp/runjob_cray.sh b/release/v0/exp/runjob_cray.sh index fe3472df8c..fd15fe730b 100755 --- a/release/v0/exp/runjob_cray.sh +++ b/release/v0/exp/runjob_cray.sh @@ -1,6 +1,6 @@ #!/bin/sh --login #BSUB -L /bin/sh -#BSUB -P FV3GFS-T2O +#BSUB -P GFS-DEV #BSUB -e err_cray #BSUB -o out_cray #BSUB -J fv3gfs From b50cb391485f6ad77d0cf408f2c0e930d0708c3c Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Wed, 18 Dec 2019 18:08:26 +0000 Subject: [PATCH 3/4] Correct GFS-T2O to GFS-DEV --- tests/rt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rt.sh b/tests/rt.sh index 7f915aa2ab..e69d689e8e 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -80,7 +80,7 @@ if [[ $MACHINE_ID = wcoss ]]; then DISKNM=/nems/noscrub/emc.nemspara/RT QUEUE=debug PARTITION= - ACCNR=GFS-T2O + ACCNR=GFS-DEV STMP=/ptmpp$pex PTMP=/ptmpp$pex SCHEDULER=lsf From 8328947fe4d9b4c54a09342f6a2d8de8a72349ca Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Wed, 18 Dec 2019 20:11:06 +0000 Subject: [PATCH 4/4] Fix wcoss_cray account # --- tests/rt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rt.sh b/tests/rt.sh index e69d689e8e..ed9b1ad2d8 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -109,7 +109,7 @@ elif [[ $MACHINE_ID = wcoss_cray ]]; then DISKNM=/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT QUEUE=debug PARTITION= - ACCNR=GFS-T2O + ACCNR=GFS-DEV if [[ -d /gpfs/hps3/ptmp ]] ; then STMP=/gpfs/hps3/stmp PTMP=/gpfs/hps3/stmp