Skip to content

Commit

Permalink
[develop] Update ufs-weather-model hash to 5324d64 (January 7) (ufs-c…
Browse files Browse the repository at this point in the history
…ommunity#1178)

* Updated ufs-weather-model hash to 5324d64 (January 7, 2025)
* Address issue ufs-community#857 by replacing #!/bin/bash with #!/usr/bin/env bash in bash scripts.
* Address issue ufs-community#1176 by adding PARTITION_DEFAULT and PARTITION_FCST to the gaea.yaml and gaea-c6.yaml machine files. Additionally, removed --partition from SCHED_NATIVE_CMD and SCHED_NATIVE_CMD_HPSS.
  • Loading branch information
MichaelLueken authored Jan 22, 2025
1 parent fb6a8b2 commit 9ca68c5
Show file tree
Hide file tree
Showing 16 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ protocol = git
repo_url = https://github.com/ufs-community/ufs-weather-model
# Specify either a branch name or a hash but not both.
#branch = develop
hash = e119370
hash = 5324d64
local_path = sorc/ufs-weather-model
required = True

Expand Down
2 changes: 1 addition & 1 deletion devbuild.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# usage instructions
usage () {
Expand Down
2 changes: 1 addition & 1 deletion devclean.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# usage instructions
usage () {
Expand Down
2 changes: 1 addition & 1 deletion jobs/JREGIONAL_INTEGRATION_TEST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash


#
Expand Down
2 changes: 1 addition & 1 deletion tests/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#=======================================================================
# Description: This script runs a build test for the
# UFS Short-Range Weather App. The executables
Expand Down
2 changes: 1 addition & 1 deletion ush/bash_utils/get_charvar_from_netcdf.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

#
#-----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ush/get_layout.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -f
#!/usr/bin/env -S bash -f
###########################################################
# get layout for given nx and ny
# INPUT: nx, ny, number of cpu to be used (optional).
Expand Down
2 changes: 1 addition & 1 deletion ush/get_mrms_files.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
#
# -----------------------------------------------------------------------
#
Expand Down
2 changes: 1 addition & 1 deletion ush/job_preamble.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set +u

Expand Down
2 changes: 1 addition & 1 deletion ush/launch_FV3LAM_wflow.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

#
#-----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ush/load_modules_run_task.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

#
#-----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ush/load_modules_wflow.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

#
#-----------------------------------------------------------------------
Expand Down
6 changes: 4 additions & 2 deletions ush/machine/gaea-c6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ platform:
QUEUE_FCST: normal
QUEUE_HPSS: normal
REMOVE_MEMORY: True
PARTITION_DEFAULT: batch
PARTITION_FCST: batch
PARTITION_HPSS: eslogin_c6
RUN_CMD_FCST: srun --export=ALL
RUN_CMD_POST: srun --export=ALL -n $nprocs
RUN_CMD_PRDGEN: srun --export=ALL -n $nprocs
RUN_CMD_SERIAL: time
RUN_CMD_UTILS: srun --export=ALL -n $nprocs
SCHED_NATIVE_CMD: --clusters=c6 --partition=batch --export=NONE
SCHED_NATIVE_CMD_HPSS: --clusters=es --partition=eslogin_c6 --export=NONE
SCHED_NATIVE_CMD: --clusters=c6 --export=NONE
SCHED_NATIVE_CMD_HPSS: --clusters=es --export=NONE
PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
TEST_EXTRN_MDL_SOURCE_BASEDIR: /gpfs/f6/bil-fire8/world-shared/UFS_SRW_data/develop/input_model_data
TEST_PREGEN_BASEDIR: /gpfs/f6/bil-fire8/world-shared/UFS_SRW_data/develop/FV3LAM_pregen
Expand Down
6 changes: 4 additions & 2 deletions ush/machine/gaea.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ platform:
QUEUE_FCST: normal
QUEUE_HPSS: normal
REMOVE_MEMORY: True
PARTITION_DEFAULT: batch
PARTITION_FCST: batch
PARTITION_HPSS: eslogin_c5
RUN_CMD_FCST: srun --export=ALL
RUN_CMD_POST: srun --export=ALL -n $nprocs
RUN_CMD_PRDGEN: srun --export=ALL -n $nprocs
RUN_CMD_SERIAL: time
RUN_CMD_UTILS: srun --export=ALL -n $nprocs
SCHED_NATIVE_CMD: --clusters=c5 --partition=batch --export=NONE
SCHED_NATIVE_CMD_HPSS: --clusters=es --partition=eslogin_c5 --export=NONE
SCHED_NATIVE_CMD: --clusters=c5 --export=NONE
SCHED_NATIVE_CMD_HPSS: --clusters=es --export=NONE
PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
TEST_EXTRN_MDL_SOURCE_BASEDIR: /gpfs/f5/epic/world-shared/UFS_SRW_data/develop/input_model_data
TEST_PREGEN_BASEDIR: /gpfs/f5/epic/world-shared/UFS_SRW_data/develop/FV3LAM_pregen
Expand Down
2 changes: 1 addition & 1 deletion ush/make_grid_mosaic_file.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

#
#-----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ush/preamble.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

#
#-----------------------------------------------------------------------
Expand Down

0 comments on commit 9ca68c5

Please sign in to comment.