Skip to content

Commit 5aa8073

Browse files
authored
MOM supergrid (#8)
* Read MOM supergrid file directly as grid
1 parent 2ea9189 commit 5aa8073

File tree

4 files changed

+959
-121
lines changed

4 files changed

+959
-121
lines changed

cicecore/cicedyn/general/ice_init.F90

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,6 +1948,7 @@ subroutine input_data
19481948
write(nu_diag,*) ' '
19491949
write(nu_diag,*) ' Grid, Discretization'
19501950
write(nu_diag,*) '--------------------------------'
1951+
write(nu_diag,1030) ' grid_format = ',trim(grid_format)
19511952
tmpstr2 = ' '
19521953
if (trim(grid_type) == 'rectangular') tmpstr2 = ' : internally defined, rectangular grid'
19531954
if (trim(grid_type) == 'regional') tmpstr2 = ' : user-defined, regional grid'
@@ -2692,14 +2693,16 @@ subroutine input_data
26922693
kmt_type /= 'channel_onenorth' .and. &
26932694
kmt_type /= 'wall' .and. &
26942695
kmt_type /= 'default' .and. &
2695-
kmt_type /= 'boxislands') then
2696+
kmt_type /= 'boxislands'.and. &
2697+
kmt_type /= 'none' ) then
26962698
if (my_task == master_task) write(nu_diag,*) subname//' ERROR: unknown kmt_type=',trim(kmt_type)
26972699
abort_list = trim(abort_list)//":27"
26982700
endif
26992701

27002702
if (grid_type /= 'column' .and. &
27012703
grid_type /= 'rectangular' .and. &
2702-
kmt_type /= 'file') then
2704+
kmt_type /= 'file' .and. &
2705+
kmt_type /= 'none') then
27032706
if (my_task == master_task) write(nu_diag,*) subname//' ERROR: need kmt file, kmt_type=',trim(kmt_type)
27042707
abort_list = trim(abort_list)//":28"
27052708
endif

0 commit comments

Comments
 (0)