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

MOM supergrid #8

Merged
merged 2 commits into from
Dec 11, 2024
Merged

MOM supergrid #8

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dce13f
Read MOM supergrid file directly as grid
anton-seaice Dec 6, 2024
7b9df14
Typos found in Code review
anton-seaice Dec 11, 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
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