Skip to content

Commit

Permalink
Add sjet partition
Browse files Browse the repository at this point in the history 
 Make syntax consistent in "if" statements in config.resources
  • Loading branch information
@jkhender
jkhender committed Jan 17, 2024
1 parent 2755e20 commit 1cf317d
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 49 deletions.
6 changes: 4 additions & 2 deletions env/JET.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ fi

step=$1

if [[ "${PARTITION_BATCH}" = "xjet" ]]; then
if [[ "${PARTITION_POST_BATCH}" = "sjet" ]]; then
export npe_node_max=16
elif [[ "${PARTITION_BATCH}" = "xjet" ]]; then
export npe_node_max=24
elif [[ "${PARTITION_BATCH}" = "vjet" ]]; then
elif [[ "${PARTITION_BATCH}" = "vjet" ]]; then
export npe_node_max=16
elif [[ "${PARTITION_BATCH}" = "kjet" ]]; then
export npe_node_max=40
Expand Down
96 changes: 49 additions & 47 deletions parm/config/gfs/config.resources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,18 @@ echo "BEGIN: config.resources"
if [[ "${machine}" = "WCOSS2" ]]; then
export npe_node_max=128
elif [[ "${machine}" = "JET" ]]; then
if [[ ${PARTITION_BATCH} = "xjet" ]]; then
if [[ "${PARTITION_POST_BATCH}" = "sjet" ]]; then
export npe_node_max=16
elif [[ "${PARTITION_BATCH}" = "xjet" ]]; then
export npe_node_max=24
elif [[ ${PARTITION_BATCH} = "vjet" || ${PARTITION_BATCH} = "sjet" ]]; then
export npe_node_max=16
elif [[ ${PARTITION_BATCH} = "kjet" ]]; then
export npe_node_max=40
fi
elif [[ ${machine} = "HERA" ]]; then
elif [[ "${machine}" = "HERA" ]]; then
export npe_node_max=40
elif [[ ${machine} = "S4" ]]; then
elif [[ "${machine}" = "S4" ]]; then
if [[ ${PARTITION_BATCH} = "s4" ]]; then
export npe_node_max=32
elif [[ ${PARTITION_BATCH} = "ivy" ]]; then
Expand All @@ -53,13 +55,13 @@ elif [[ ${machine} = "S4" ]]; then
elif [[ "${machine}" = "AWSPW" ]]; then
export PARTITION_BATCH="compute"
export npe_node_max=40
elif [[ ${machine} = "ORION" ]]; then
elif [[ "${machine}" = "ORION" ]]; then
export npe_node_max=40
elif [[ ${machine} = "HERCULES" ]]; then
elif [[ "${machine}" = "HERCULES" ]]; then
export npe_node_max=40
fi

if [[ ${step} = "prep" ]]; then
if [[ "${step}" = "prep" ]]; then
export wtime_prep='00:30:00'
export npe_prep=4
export npe_node_prep=2
Expand Down Expand Up @@ -94,7 +96,7 @@ elif [[ "${step}" = "aerosol_init" ]]; then
export NTASKS=${npe_aerosol_init}
export memory_aerosol_init="6G"

elif [[ ${step} = "waveinit" ]]; then
elif [[ "${step}" = "waveinit" ]]; then

export wtime_waveinit="00:10:00"
export npe_waveinit=12
Expand All @@ -104,7 +106,7 @@ elif [[ ${step} = "waveinit" ]]; then
export NTASKS=${npe_waveinit}
export memory_waveinit="2GB"

elif [[ ${step} = "waveprep" ]]; then
elif [[ "${step}" = "waveprep" ]]; then

export wtime_waveprep="00:10:00"
export npe_waveprep=5
Expand All @@ -120,7 +122,7 @@ elif [[ ${step} = "waveprep" ]]; then
export memory_waveprep="100GB"
export memory_waveprep_gfs="150GB"

elif [[ ${step} = "wavepostsbs" ]]; then
elif [[ "${step}" = "wavepostsbs" ]]; then

export wtime_wavepostsbs="00:20:00"
export wtime_wavepostsbs_gfs="03:00:00"
Expand All @@ -132,7 +134,7 @@ elif [[ ${step} = "wavepostsbs" ]]; then
export memory_wavepostsbs="10GB"
export memory_wavepostsbs_gfs="10GB"

elif [[ ${step} = "wavepostbndpnt" ]]; then
elif [[ "${step}" = "wavepostbndpnt" ]]; then

export wtime_wavepostbndpnt="01:00:00"
export npe_wavepostbndpnt=240
Expand All @@ -142,7 +144,7 @@ elif [[ ${step} = "wavepostbndpnt" ]]; then
export NTASKS=${npe_wavepostbndpnt}
export is_exclusive=True

elif [[ ${step} = "wavepostbndpntbll" ]]; then
elif [[ "${step}" = "wavepostbndpntbll" ]]; then

export wtime_wavepostbndpntbll="01:00:00"
export npe_wavepostbndpntbll=448
Expand All @@ -152,7 +154,7 @@ elif [[ ${step} = "wavepostbndpntbll" ]]; then
export NTASKS=${npe_wavepostbndpntbll}
export is_exclusive=True

elif [[ ${step} = "wavepostpnt" ]]; then
elif [[ "${step}" = "wavepostpnt" ]]; then

export wtime_wavepostpnt="04:00:00"
export npe_wavepostpnt=200
Expand All @@ -162,7 +164,7 @@ elif [[ ${step} = "wavepostpnt" ]]; then
export NTASKS=${npe_wavepostpnt}
export is_exclusive=True

elif [[ ${step} = "wavegempak" ]]; then
elif [[ "${step}" = "wavegempak" ]]; then

export wtime_wavegempak="02:00:00"
export npe_wavegempak=1
Expand All @@ -172,7 +174,7 @@ elif [[ ${step} = "wavegempak" ]]; then
export NTASKS=${npe_wavegempak}
export memory_wavegempak="1GB"

elif [[ ${step} = "waveawipsbulls" ]]; then
elif [[ "${step}" = "waveawipsbulls" ]]; then

export wtime_waveawipsbulls="00:20:00"
export npe_waveawipsbulls=1
Expand Down Expand Up @@ -459,7 +461,7 @@ elif [[ "${step}" = "ocnanalvrfy" ]]; then
export npe_node_ocnanalvrfy
export memory_ocnanalvrfy="24GB"

elif [[ ${step} = "anal" ]]; then
elif [[ "${step}" = "anal" ]]; then

export wtime_anal="00:50:00"
export wtime_anal_gfs="00:40:00"
Expand All @@ -471,12 +473,12 @@ elif [[ ${step} = "anal" ]]; then
export nth_anal=8
export nth_anal_gfs=8
fi
if [[ ${CASE} = "C384" ]]; then
if [[ "${CASE}" = "C384" ]]; then
export npe_anal=160
export npe_anal_gfs=160
export nth_anal=10
export nth_anal_gfs=10
if [[ ${machine} = "S4" ]]; then
if [[ "${machine}" = "S4" ]]; then
#On the S4-s4 partition, this is accomplished by increasing the task
#count to a multiple of 32
if [[ ${PARTITION_BATCH} = "s4" ]]; then
Expand All @@ -489,14 +491,14 @@ elif [[ ${step} = "anal" ]]; then
export wtime_anal="02:00:00"
fi
fi
if [[ ${CASE} = "C192" || ${CASE} = "C96" || ${CASE} = "C48" ]]; then
if [[ "${CASE}" = "C192" || "${CASE}" = "C96" || "${CASE}" = "C48" ]]; then
export npe_anal=84
export npe_anal_gfs=84
if [[ ${machine} = "S4" ]]; then
if [[ "${machine}" = "S4" ]]; then
export nth_anal=4
export nth_anal_gfs=4
#Adjust job count for S4
if [[ ${PARTITION_BATCH} = "s4" ]]; then
if [[ "${PARTITION_BATCH}" = "s4" ]]; then
export npe_anal=88
export npe_anal_gfs=88
elif [[ ${PARTITION_BATCH} = "ivy" ]]; then
Expand All @@ -512,7 +514,7 @@ elif [[ ${step} = "anal" ]]; then
export npe_node_cycle
export is_exclusive=True

elif [[ ${step} = "analcalc" ]]; then
elif [[ "${step}" = "analcalc" ]]; then

export wtime_analcalc="00:10:00"
export npe_analcalc=127
Expand All @@ -525,7 +527,7 @@ elif [[ ${step} = "analcalc" ]]; then
export is_exclusive=True
export memory_analcalc="48GB"

elif [[ ${step} = "analdiag" ]]; then
elif [[ "${step}" = "analdiag" ]]; then

export wtime_analdiag="00:15:00"
export npe_analdiag=96 # Should be at least twice npe_ediag
Expand All @@ -534,7 +536,7 @@ elif [[ ${step} = "analdiag" ]]; then
export npe_node_analdiag
export memory_analdiag="48GB"

elif [[ ${step} = "sfcanl" ]]; then
elif [[ "${step}" = "sfcanl" ]]; then

export wtime_sfcanl="00:10:00"
export npe_sfcanl=6
Expand Down Expand Up @@ -671,14 +673,14 @@ elif [[ "${step}" = "fcst" || "${step}" = "efcs" ]]; then
unset _CDUMP _CDUMP_LIST
unset NTASKS_TOT

elif [[ ${step} = "ocnpost" ]]; then
elif [[ "${step}" = "ocnpost" ]]; then

export wtime_ocnpost="00:30:00"
export npe_ocnpost=1
export npe_node_ocnpost=1
export nth_ocnpost=1
export memory_ocnpost="96G"
if [[ ${machine} == "JET" ]]; then
if [[ "${machine}" == "JET" ]]; then
# JET only has 88GB of requestable memory per node
# so a second node is required to meet the requiremtn
npe_ocnpost=2
Expand Down Expand Up @@ -779,7 +781,7 @@ elif [[ "${step}" = "fit2obs" ]]; then
export nth_fit2obs=1
export npe_node_fit2obs=1
export memory_fit2obs="20G"
if [[ ${machine} == "WCOSS2" ]]; then export npe_node_fit2obs=3 ; fi
if [[ "${machine}" == "WCOSS2" ]]; then export npe_node_fit2obs=3 ; fi

elif [[ "${step}" = "metp" ]]; then

Expand All @@ -792,7 +794,7 @@ elif [[ "${step}" = "metp" ]]; then
export npe_node_metp_gfs=4
export is_exclusive=True

elif [[ ${step} = "echgres" ]]; then
elif [[ "${step}" = "echgres" ]]; then

export wtime_echgres="00:10:00"
export npe_echgres=3
Expand All @@ -802,22 +804,22 @@ elif [[ ${step} = "echgres" ]]; then
export memory_echgres="200GB"
fi

elif [[ ${step} = "init" ]]; then
elif [[ "${step}" = "init" ]]; then

export wtime_init="00:30:00"
export npe_init=24
export nth_init=1
export npe_node_init=6
export memory_init="70G"

elif [[ ${step} = "init_chem" ]]; then
elif [[ "${step}" = "init_chem" ]]; then

export wtime_init_chem="00:30:00"
export npe_init_chem=1
export npe_node_init_chem=1
export is_exclusive=True

elif [[ ${step} = "mom6ic" ]]; then
elif [[ "${step}" = "mom6ic" ]]; then

export wtime_mom6ic="00:30:00"
export npe_mom6ic=24
Expand Down Expand Up @@ -889,15 +891,15 @@ elif [[ "${step}" = "atmensanlfinal" ]]; then
export npe_node_atmensanlfinal
export is_exclusive=True

elif [[ ${step} = "eobs" || ${step} = "eomg" ]]; then
elif [[ "${step}" = "eobs" || "${step}" = "eomg" ]]; then

export wtime_eobs="00:15:00"
export wtime_eomg="01:00:00"
if [[ ${CASE} = "C768" ]]; then
if [[ "${CASE}" = "C768" ]]; then
export npe_eobs=200
elif [[ ${CASE} = "C384" ]]; then
elif [[ "${CASE}" = "C384" ]]; then
export npe_eobs=100
elif [[ ${CASE} = "C192" || ${CASE} = "C96" || ${CASE} = "C48" ]]; then
elif [[ "${CASE}" = "C192" || "${CASE}" = "C96" || "${CASE}" = "C48" ]]; then
export npe_eobs=40
fi
export npe_eomg=${npe_eobs}
Expand All @@ -909,11 +911,11 @@ elif [[ ${step} = "eobs" || ${step} = "eomg" ]]; then
export is_exclusive=True
#The number of tasks and cores used must be the same for eobs
#For S4, this is accomplished by running 10 tasks/node
if [[ ${machine} = "S4" ]]; then
if [[ "${machine}" = "S4" ]]; then
export npe_node_eobs=10
fi

elif [[ ${step} = "ediag" ]]; then
elif [[ "${step}" = "ediag" ]]; then

export wtime_ediag="00:15:00"
export npe_ediag=48
Expand All @@ -922,27 +924,27 @@ elif [[ ${step} = "ediag" ]]; then
export npe_node_ediag
export memory_ediag="30GB"

elif [[ ${step} = "eupd" ]]; then
elif [[ "${step}" = "eupd" ]]; then

export wtime_eupd="00:30:00"
if [[ ${CASE} = "C768" ]]; then
if [[ "${CASE}" = "C768" ]]; then
export npe_eupd=480
export nth_eupd=6
if [[ "${machine}" = "WCOSS2" ]]; then
export npe_eupd=315
export nth_eupd=14
fi
elif [[ ${CASE} = "C384" ]]; then
elif [[ "${CASE}" = "C384" ]]; then
export npe_eupd=270
export nth_eupd=8
if [[ "${machine}" = "WCOSS2" ]]; then
export npe_eupd=315
export nth_eupd=14
elif [[ ${machine} = "S4" ]]; then
elif [[ "${machine}" = "S4" ]]; then
export npe_eupd=160
export nth_eupd=2
fi
elif [[ ${CASE} = "C192" || ${CASE} = "C96" || ${CASE} = "C48" ]]; then
elif [[ "${CASE}" = "C192" || "${CASE}" = "C96" || "${CASE}" = "C48" ]]; then
export npe_eupd=42
export nth_eupd=2
if [[ "${machine}" = "HERA" || "${machine}" = "JET" ]]; then
Expand All @@ -953,21 +955,21 @@ elif [[ ${step} = "eupd" ]]; then
export npe_node_eupd
export is_exclusive=True

elif [[ ${step} = "ecen" ]]; then
elif [[ "${step}" = "ecen" ]]; then

export wtime_ecen="00:10:00"
export npe_ecen=80
export nth_ecen=4
if [[ "${machine}" = "HERA" ]]; then export nth_ecen=6; fi
if [[ ${CASE} = "C384" || ${CASE} = "C192" || ${CASE} = "C96" || ${CASE} = "C48" ]]; then export nth_ecen=2; fi
if [[ "${CASE}" = "C384" || "${CASE}" = "C192" || "${CASE}" = "C96" || "${CASE}" = "C48" ]]; then export nth_ecen=2; fi
npe_node_ecen=$(echo "${npe_node_max} / ${nth_ecen}" | bc)
export npe_node_ecen
export nth_cycle=${nth_ecen}
npe_node_cycle=$(echo "${npe_node_max} / ${nth_cycle}" | bc)
export npe_node_cycle
export is_exclusive=True

elif [[ ${step} = "esfc" ]]; then
elif [[ "${step}" = "esfc" ]]; then

export wtime_esfc="00:08:00"
export npe_esfc=80
Expand All @@ -979,7 +981,7 @@ elif [[ ${step} = "esfc" ]]; then
export npe_node_cycle
export memory_esfc="80GB"

elif [[ ${step} = "epos" ]]; then
elif [[ "${step}" = "epos" ]]; then

export wtime_epos="00:15:00"
export npe_epos=80
Expand All @@ -988,7 +990,7 @@ elif [[ ${step} = "epos" ]]; then
export npe_node_epos
export is_exclusive=True

elif [[ ${step} = "postsnd" ]]; then
elif [[ "${step}" = "postsnd" ]]; then

export wtime_postsnd="02:00:00"
export npe_postsnd=40
Expand All @@ -1003,7 +1005,7 @@ elif [[ ${step} = "postsnd" ]]; then
fi
export is_exclusive=True

elif [[ ${step} = "awips" ]]; then
elif [[ "${step}" = "awips" ]]; then

export wtime_awips="03:30:00"
export npe_awips=1
Expand Down

0 comments on commit 1cf317d

Please sign in to comment.