-
Notifications
You must be signed in to change notification settings - Fork 247
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add bash linting to CI. Cleanup .sh scripts a bit. Address .sh bugs. …
…Adds -v Verbose option. (#2218) Remove nowarn Intel compiler flag (#2225) * UFSWM - Add bash linting to CI: - uses superlinter to check for consistent bash code writing - Cleans up .sh scripts to comply with superlinter - Cleans up .sh scripts to be more consistent, easier to read. - Add's -v verbose option if debugging outputs needed, otherwise simplifies rt.sh run echo's. - Addresses smaller bugs - quota/timeout search logic adjusted. - check for dirs existing (DISKNM, STMP, PTMP) before starting. - adjustments/cleanup to ecflow/rocoto sections - rt.sh will attempt to start ecflow, and only stop ecflow if it started from rt.sh. - fix for issue where run_dir will not delete properly. * FV3: Address compiler warnings * atmos_cubed_sphere: Address compiler warnings.
- Loading branch information
1 parent
4f32a4b
commit 47c0099
Showing
27 changed files
with
5,135 additions
and
4,710 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
--- | ||
name: Super-Linter | ||
|
||
on: | ||
push: null | ||
pull_request: null | ||
|
||
jobs: | ||
build: | ||
name: Lint | ||
runs-on: ubuntu-latest | ||
|
||
permissions: | ||
contents: read | ||
packages: read | ||
statuses: write | ||
|
||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Super-Linter | ||
uses: super-linter/[email protected] | ||
env: | ||
LINTER_RULES_PATH: / | ||
DEFAULT_BRANCH: origin/develop | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
FILTER_REGEX_EXCLUDE: .*(tests/fv3_conf/.*|tests/ci/.*|tests/auto/.*|tests/auto-jenkins/.*|tests/opnReqTests/.*|tests/opnReqTest|tests/atparse.bash).* | ||
VALIDATE_BASH: true | ||
BASH_SEVERITY: style | ||
#VALIDATE_GITHUB_ACTIONS: true | ||
#VALIDATE_LUA: true | ||
#VALIDATE_MARKDOWN: true | ||
#VALIDATE_PYTHON_PYLINT: true | ||
#VALIDATE_YAML: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# Global settings for Shellcheck (https://github.com/koalaman/shellcheck) | ||
enable=all | ||
|
||
external-sources=true | ||
|
||
# Disable variable referenced but not assigned | ||
disable=SC2154 | ||
|
||
# Disable following non-constant source | ||
disable=SC1090 | ||
|
||
# Disable non-existent binary | ||
disable=SC1091 | ||
|
||
# Disable -p -m only applies to deepest directory | ||
disable=SC2174 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,29 @@ | ||
#!/bin/bash | ||
set -eu | ||
|
||
if [[ $(uname -s) == Darwin ]]; then | ||
readonly UFS_MODEL_DIR=$(cd "$(dirname "$(greadlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P) | ||
uname_s=$(uname -s) | ||
if [[ ${uname_s} == Darwin ]]; then | ||
UFS_MODEL_DIR=$(greadlink -f -n "${BASH_SOURCE[0]}") | ||
UFS_MODEL_DIR=$(dirname "${UFS_MODEL_DIR}") | ||
UFS_MODEL_DIR=$(cd "${UFS_MODEL_DIR}" && pwd -P) | ||
else | ||
readonly UFS_MODEL_DIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P) | ||
UFS_MODEL_DIR=$(readlink -f -n "${BASH_SOURCE[0]}") | ||
UFS_MODEL_DIR=$(dirname "${UFS_MODEL_DIR}") | ||
UFS_MODEL_DIR=$(cd "${UFS_MODEL_DIR}" && pwd -P) | ||
fi | ||
echo "UFS MODEL DIR: ${UFS_MODEL_DIR}" | ||
readonly UFS_MODEL_DIR | ||
|
||
export CC=${CC:-mpicc} | ||
export CXX=${CXX:-mpicxx} | ||
export FC=${FC:-mpif90} | ||
|
||
BUILD_DIR=${BUILD_DIR:-${UFS_MODEL_DIR}/build} | ||
mkdir -p ${BUILD_DIR} | ||
mkdir -p "${BUILD_DIR}" | ||
|
||
cd ${BUILD_DIR} | ||
cmake ${UFS_MODEL_DIR} ${CMAKE_FLAGS} | ||
cd "${BUILD_DIR}" | ||
ARR_CMAKE_FLAGS=() | ||
for i in ${CMAKE_FLAGS}; do ARR_CMAKE_FLAGS+=("${i}") ; done | ||
cmake "${UFS_MODEL_DIR}" "${ARR_CMAKE_FLAGS[@]}" | ||
# Turn off OpenMP threading for parallel builds | ||
# to avoid exhausting the number of user processes | ||
OMP_NUM_THREADS=1 make -j ${BUILD_JOBS:-4} VERBOSE=${BUILD_VERBOSE:-} | ||
OMP_NUM_THREADS=1 make -j "${BUILD_JOBS:-4}" "VERBOSE=${BUILD_VERBOSE:-1}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule stochastic_physics
updated
7 files
+1 −1 | cellular_automata_global.F90 | |
+1 −1 | cellular_automata_sgs.F90 | |
+5 −0 | plumes.F90 | |
+4 −3 | spectral_transforms.F90 | |
+1 −3 | stochy_data_mod.F90 | |
+2 −2 | stochy_patterngenerator.F90 | |
+4 −2 | update_ca.F90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.