Skip to content

Commit 6a7458b

Browse files
committed
Merge remote-tracking branch 'gfdl/dev/gfdl' into fix_obc_maskingdepth
2 parents 24e195f + 484b917 commit 6a7458b

Some content is hidden

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

51 files changed

+7434
-1947
lines changed

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
html
55

66

7+
# Build output
8+
*.o
9+
*.mod
10+
MOM6
11+
build/
12+
deps/
13+
pkg/MARBL
14+
15+
716
# Autoconf output
817
aclocal.m4
918
autom4te.cache/

config_src/drivers/nuopc_cap/mom_cap.F90

Lines changed: 230 additions & 100 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)