Skip to content

Commit 869986a

Browse files
OlgaSergienkoOlgaSergienko
committed
Merge branch 'dev/cryo' of github.com:gfdl-cryosphere/MOM6 into gfdl_cryo
2 parents 6d3fd76 + 8a791a7 commit 869986a

376 files changed

Lines changed: 5662 additions & 2340 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/macos-setup/action.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This file is part of MOM6, the Modular Ocean Model version 6.
2+
# See the LICENSE file for licensing information.
3+
# SPDX-License-Identifier: Apache-2.0
4+
15
name: 'install-macos-prerequisites'
26

37
description: 'Install prerequisites for Mac OS compilation'

‎.github/actions/ubuntu-setup/action.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This file is part of MOM6, the Modular Ocean Model version 6.
2+
# See the LICENSE file for licensing information.
3+
# SPDX-License-Identifier: Apache-2.0
4+
15
name: 'install-ubuntu-prerequisites'
26

37
description: 'Install prerequisites for Ubuntu Linux compilation'

‎.github/workflows/verify-linux.yml‎

Lines changed: 41 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This file is part of MOM6, the Modular Ocean Model version 6.
2+
# See the LICENSE file for licensing information.
3+
# SPDX-License-Identifier: Apache-2.0
4+
15
name: Linux verification
26

37
on: [push, pull_request]
@@ -14,8 +18,6 @@ jobs:
1418

1519
steps:
1620
- uses: actions/checkout@v4
17-
with:
18-
submodules: recursive
1921

2022
- name: Check white space (non-blocking)
2123
run: |
@@ -50,13 +52,14 @@ jobs:
5052

5153
steps:
5254
- uses: actions/checkout@v4
53-
with:
54-
submodules: recursive
5555

5656
- uses: ./.github/actions/ubuntu-setup/
5757

58-
- name: Compile FMS
59-
run: make -C .testing -j build/deps/lib/libFMS.a
58+
- name: Compile dependencies
59+
run: |
60+
make -C .testing -j build/deps/lib/libFMS.a
61+
make -C .testing -j PKG= build/deps/lib/libgsw.a
62+
make -C .testing -j PKG= build/deps/lib/libcvmix.a
6063
6164
- name: Compile MOM6 with symmetric indexing
6265
run: make -C .testing -j build/symmetric/MOM6
@@ -75,13 +78,14 @@ jobs:
7578

7679
steps:
7780
- uses: actions/checkout@v4
78-
with:
79-
submodules: recursive
8081

8182
- uses: ./.github/actions/ubuntu-setup/
8283

83-
- name: Compile FMS
84-
run: make -C .testing -j build/deps/lib/libFMS.a
84+
- name: Compile dependencies
85+
run: |
86+
make -C .testing -j build/deps/lib/libFMS.a
87+
make -C .testing -j PKG= build/deps/lib/libgsw.a
88+
make -C .testing -j PKG= build/deps/lib/libcvmix.a
8589
8690
- name: Compile MOM6 with asymmetric indexing
8791
run: make -C .testing -j build/asymmetric/MOM6
@@ -100,13 +104,14 @@ jobs:
100104

101105
steps:
102106
- uses: actions/checkout@v4
103-
with:
104-
submodules: recursive
105107

106108
- uses: ./.github/actions/ubuntu-setup/
107109

108-
- name: Compile FMS
109-
run: make -C .testing -j build/deps/lib/libFMS.a
110+
- name: Compile dependencies
111+
run: |
112+
make -C .testing -j build/deps/lib/libFMS.a
113+
make -C .testing -j PKG= build/deps/lib/libgsw.a
114+
make -C .testing -j PKG= build/deps/lib/libcvmix.a
110115
111116
- name: Compile MOM6 with bit-reproducible optimization
112117
run: make -C .testing -j build/repro/MOM6
@@ -125,13 +130,14 @@ jobs:
125130

126131
steps:
127132
- uses: actions/checkout@v4
128-
with:
129-
submodules: recursive
130133

131134
- uses: ./.github/actions/ubuntu-setup/
132135

133-
- name: Compile FMS
134-
run: make -C .testing -j build/deps/lib/libFMS.a
136+
- name: Compile dependencies
137+
run: |
138+
make -C .testing -j build/deps/lib/libFMS.a
139+
make -C .testing -j PKG= build/deps/lib/libgsw.a
140+
make -C .testing -j PKG= build/deps/lib/libcvmix.a
135141
136142
- name: Compile MOM6 supporting OpenMP
137143
run: make -C .testing -j build/openmp/MOM6
@@ -151,12 +157,10 @@ jobs:
151157

152158
steps:
153159
- uses: actions/checkout@v4
154-
with:
155-
submodules: recursive
156160

157161
- uses: ./.github/actions/ubuntu-setup/
158162

159-
- name: Compile target FMS
163+
- name: Compile target depedencies
160164
run: |
161165
make -C .testing \
162166
DO_REGRESSION_TESTS=1 \
@@ -184,13 +188,14 @@ jobs:
184188

185189
steps:
186190
- uses: actions/checkout@v4
187-
with:
188-
submodules: recursive
189191

190192
- uses: ./.github/actions/ubuntu-setup/
191193

192-
- name: Compile FMS
193-
run: make -C .testing -j build/deps/lib/libFMS.a
194+
- name: Compile dependencies
195+
run: |
196+
make -C .testing -j build/deps/lib/libFMS.a
197+
make -C .testing -j PKG= build/deps/lib/libgsw.a
198+
make -C .testing -j PKG= build/deps/lib/libcvmix.a
194199
195200
- name: Compile MOM6 with aggressive optimization
196201
run: make -C .testing -j build/opt/MOM6
@@ -217,12 +222,10 @@ jobs:
217222

218223
steps:
219224
- uses: actions/checkout@v4
220-
with:
221-
submodules: recursive
222225

223226
- uses: ./.github/actions/ubuntu-setup/
224227

225-
- name: Compile target FMS
228+
- name: Compile target dependencies
226229
run: |
227230
make -C .testing \
228231
DO_REGRESSION_TESTS=1 \
@@ -260,13 +263,14 @@ jobs:
260263

261264
steps:
262265
- uses: actions/checkout@v4
263-
with:
264-
submodules: recursive
265266

266267
- uses: ./.github/actions/ubuntu-setup/
267268

268-
- name: Compile FMS
269-
run: make -C .testing -j build/deps/lib/libFMS.a
269+
- name: Compile dependencies
270+
run: |
271+
make -C .testing -j build/deps/lib/libFMS.a
272+
make -C .testing -j PKG= build/deps/lib/libgsw.a
273+
make -C .testing -j PKG= build/deps/lib/libcvmix.a
270274
271275
- name: Compile MOM6 with code coverage
272276
run: make -C .testing -j build/cov/MOM6
@@ -296,13 +300,14 @@ jobs:
296300

297301
steps:
298302
- uses: actions/checkout@v4
299-
with:
300-
submodules: recursive
301303

302304
- uses: ./.github/actions/ubuntu-setup/
303305

304-
- name: Compile FMS
305-
run: make -C .testing -j build/deps/lib/libFMS.a
306+
- name: Compile dependencies
307+
run: |
308+
make -C .testing -j build/deps/lib/libFMS.a
309+
make -C .testing -j PKG= build/deps/lib/libgsw.a
310+
make -C .testing -j PKG= build/deps/lib/libcvmix.a
306311
307312
- name: Compile MOM6 for the GFDL coupled driver
308313
run: make -C .testing -j check_mom6_api_coupled
@@ -317,8 +322,6 @@ jobs:
317322

318323
steps:
319324
- uses: actions/checkout@v4
320-
with:
321-
submodules: recursive
322325

323326
- uses: ./.github/actions/ubuntu-setup
324327

@@ -350,8 +353,6 @@ jobs:
350353

351354
steps:
352355
- uses: actions/checkout@v4
353-
with:
354-
submodules: recursive
355356

356357
- uses: ./.github/actions/ubuntu-setup
357358

@@ -375,8 +376,6 @@ jobs:
375376

376377
steps:
377378
- uses: actions/checkout@v4
378-
with:
379-
submodules: recursive
380379

381380
- uses: ./.github/actions/ubuntu-setup
382381

@@ -400,8 +399,6 @@ jobs:
400399

401400
steps:
402401
- uses: actions/checkout@v4
403-
with:
404-
submodules: recursive
405402

406403
- uses: ./.github/actions/ubuntu-setup
407404

@@ -425,8 +422,6 @@ jobs:
425422

426423
steps:
427424
- uses: actions/checkout@v4
428-
with:
429-
submodules: recursive
430425

431426
- uses: ./.github/actions/ubuntu-setup
432427

@@ -460,8 +455,6 @@ jobs:
460455

461456
steps:
462457
- uses: actions/checkout@v4
463-
with:
464-
submodules: recursive
465458

466459
- uses: ./.github/actions/ubuntu-setup
467460

@@ -487,8 +480,6 @@ jobs:
487480

488481
steps:
489482
- uses: actions/checkout@v4
490-
with:
491-
submodules: recursive
492483

493484
- uses: ./.github/actions/ubuntu-setup
494485

@@ -522,8 +513,6 @@ jobs:
522513

523514
steps:
524515
- uses: actions/checkout@v4
525-
with:
526-
submodules: recursive
527516

528517
- uses: ./.github/actions/ubuntu-setup
529518

@@ -558,8 +547,6 @@ jobs:
558547

559548
steps:
560549
- uses: actions/checkout@v4
561-
with:
562-
submodules: recursive
563550

564551
- uses: ./.github/actions/ubuntu-setup
565552

@@ -592,8 +579,6 @@ jobs:
592579

593580
steps:
594581
- uses: actions/checkout@v4
595-
with:
596-
submodules: recursive
597582

598583
- uses: ./.github/actions/ubuntu-setup
599584

@@ -638,8 +623,6 @@ jobs:
638623

639624
steps:
640625
- uses: actions/checkout@v4
641-
with:
642-
submodules: recursive
643626

644627
- uses: ./.github/actions/ubuntu-setup
645628

@@ -670,8 +653,6 @@ jobs:
670653

671654
steps:
672655
- uses: actions/checkout@v4
673-
with:
674-
submodules: recursive
675656

676657
- uses: ./.github/actions/ubuntu-setup
677658

0 commit comments

Comments
 (0)
⚡