Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for mom (supergrid) grid format #993

Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open

Add support for mom (supergrid) grid format #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c47f165
initial work
anton-seaice Oct 9, 2024
6ca3e15
more work
anton-seaice Oct 11, 2024
27f36c7
tidy
anton-seaice Oct 11, 2024
c8aa2ff
corrections
anton-seaice Oct 17, 2024
d0e0595
Allow for varname=mask and reading different size nc files
anton-seaice Oct 18, 2024
f498d2b
clean and remove a little duplication
anton-seaice Oct 18, 2024
ea56c37
remove extra line
anton-seaice Oct 20, 2024
3d9566a
deprecate cpom orca grid
anton-seaice Oct 22, 2024
388612d
fix gadi test submission
anton-seaice Oct 22, 2024
9555346
Update cicecore/cicedyn/general/ice_init.F90
anton-seaice Oct 27, 2024
376170e
Merge branch 'kmt_read_tidy' into mom_mosaic
anton-seaice Oct 28, 2024
3513a57
fix merge
anton-seaice Oct 28, 2024
9da5157
Squashed commit of the following:
anton-seaice Oct 28, 2024
3465c89
merge remove orca grid
anton-seaice Oct 28, 2024
4657826
bit of a refactor / tidy
anton-seaice Oct 28, 2024
e9dd876
working for tripolar grid & with mesh checks
anton-seaice Nov 1, 2024
21d9173
tidy ups
anton-seaice Nov 4, 2024
ded1a1b
improvements and formatting
anton-seaice Nov 5, 2024
1ad0c4c
Merge remote-tracking branch 'origin/main' into remove_orca_grid
anton-seaice Nov 5, 2024
bdce487
fix merge
anton-seaice Nov 5, 2024
64cc5c5
Merge remote-tracking branch 'access/remove_orca_grid' into mom_mosaic
anton-seaice Nov 6, 2024
a450635
remove debugging statements
anton-seaice Nov 6, 2024
6bd9ee8
rm unrelated changes
anton-seaice Nov 6, 2024
ddfd94b
formatting and tidy
anton-seaice Nov 6, 2024
cb482a2
formatting and tidy ups
anton-seaice Nov 6, 2024
ff7d76a
docs
anton-seaice Nov 7, 2024
d0f8a34
Merge remote-tracking branch 'origin/main' into mom_mosaic
anton-seaice Nov 7, 2024
ca7c12d
fix docs
anton-seaice Nov 7, 2024
3d3ab83
Update doc/source/user_guide/ug_implementation.rst
anton-seaice Nov 7, 2024
0a28ca9
comments and indents
anton-seaice Nov 7, 2024
b7528e7
change mom_mosaic -> mom_nc
anton-seaice Nov 10, 2024
17f33c8
add grid format to log
anton-seaice Nov 10, 2024
1d41510
allocate error handling
anton-seaice Nov 10, 2024
e17f98d
Change docs to use mom_nc
anton-seaice Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions cicecore/cicedyn/general/ice_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1948,6 +1948,7 @@ subroutine input_data
write(nu_diag,*) ' '
write(nu_diag,*) ' Grid, Discretization'
write(nu_diag,*) '--------------------------------'
write(nu_diag,1030) ' grid_format = ',trim(grid_format)
tmpstr2 = ' '
if (trim(grid_type) == 'rectangular') tmpstr2 = ' : internally defined, rectangular grid'
if (trim(grid_type) == 'regional') tmpstr2 = ' : user-defined, regional grid'
Expand Down Expand Up @@ -2692,14 +2693,16 @@ subroutine input_data
kmt_type /= 'channel_onenorth' .and. &
kmt_type /= 'wall' .and. &
kmt_type /= 'default' .and. &
kmt_type /= 'boxislands') then
kmt_type /= 'boxislands'.and. &
kmt_type /= 'none' ) then
if (my_task == master_task) write(nu_diag,*) subname//' ERROR: unknown kmt_type=',trim(kmt_type)
abort_list = trim(abort_list)//":27"
endif

if (grid_type /= 'column' .and. &
grid_type /= 'rectangular' .and. &
kmt_type /= 'file') then
kmt_type /= 'file' .and. &
kmt_type /= 'none') then
anton-seaice marked this conversation as resolved.
Show resolved Hide resolved
if (my_task == master_task) write(nu_diag,*) subname//' ERROR: need kmt file, kmt_type=',trim(kmt_type)
abort_list = trim(abort_list)//":28"
endif
Expand Down
Loading
Loading