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/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 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..ed9b1ad2d8 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 @@ -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 @@ -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