Skip to content

Commit

Permalink
Merge pull request #249 from gustavo-marques/merge_main_20230406
Browse files Browse the repository at this point in the history
Merge changes from GFDL to main (2023-04-06)
  • Loading branch information
alperaltuntas authored Jul 7, 2023
2 parents 2e77200 + 3c457c3 commit aa58724
Show file tree
Hide file tree
Showing 202 changed files with 14,868 additions and 8,495 deletions.
2 changes: 1 addition & 1 deletion .github/actions/macos-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
shell: bash
run: |
echo "::group::Install packages"
brew update
brew reinstall gcc
brew install automake
brew install netcdf
brew install netcdf-fortran
Expand Down
12 changes: 0 additions & 12 deletions .github/actions/testing-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ inputs:
description: 'If true, will build the symmetric MOM6 executable'
required: false
default: 'true'
install_python:
description: 'If true, will install the local python env needed for .testing'
required: false
default: 'true'
runs:
using: 'composite'
steps:
Expand Down Expand Up @@ -54,14 +50,6 @@ runs:
test ${{ inputs.build_symmetric }} == true && make build/symmetric/MOM6 -j
echo "::endgroup::"
- name: Install local python venv for generating input data
shell: bash
run: |
echo "::group::Create local python env for input data generation"
cd .testing
test ${{ inputs.install_python }} == true && make work/local-env
echo "::endgroup::"
- name: Set flags
shell: bash
run: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/coupled-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
- uses: ./.github/actions/testing-setup
with:
build_symmetric: 'false'
install_python: 'false'

- name: Compile MOM6 for the GFDL coupled driver
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
runs-on: macOS-latest

env:
CC: gcc-11
FC: gfortran-11
CC: gcc
FC: gfortran

defaults:
run:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-stencil.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
runs-on: macOS-latest

env:
CC: gcc-11
FC: gfortran-11
CC: gcc
FC: gfortran

defaults:
run:
Expand Down
Loading

0 comments on commit aa58724

Please sign in to comment.