Skip to content

Update waveheight branch #5

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

Merged
eclare108213 merged 5 commits into from
Jan 9, 2026
Merged

Update waveheight branch #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25ce26d
Update Carpenter Port (#1076)
apcraig Dec 18, 2025
3ed0800
documentation for averaging (#1056)
eclare108213 Dec 19, 2025
26a5cfe
Add ability to read an extended grid (supported for pop netcdf file f…
apcraig Jan 8, 2026
c0bc20d
Merge branch 'waveheight' of https://github.com/eclare108213/cice
apcraig Jan 9, 2026
f0ded3f
Update Icepack to #0bcde255637a594
apcraig Jan 9, 2026
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
6 changes: 4 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 @@ -1263,7 +1263,8 @@ subroutine input_data
if (trim(ice_data_type) == 'default') ice_data_type = 'latsst'

! For backward compatibility
if (grid_format == 'nc') grid_format = 'pop_nc'
if (grid_format == 'nc' ) grid_format = 'pop_nc'
if (grid_format == 'nc_ext') grid_format = 'pop_nc_ext'

!-----------------------------------------------------------------
! verify inputs
Expand Down Expand Up @@ -2487,7 +2488,7 @@ subroutine input_data
elseif (trim(wave_height_type) == 'none') then
tmpstr2 = ' : no wave height data available, default==0'
endif
write(nu_diag,1010) ' wave_height_type = ', trim(wave_height_type),trim(tmpstr2)
write(nu_diag,1030) ' wave_height_type = ', trim(wave_height_type),trim(tmpstr2)
endif

write(nu_diag,*) ' '
Expand Down Expand Up @@ -2780,6 +2781,7 @@ subroutine input_data
endif ! my_task = master_task

if (grid_format /= 'pop_nc' .and. &
grid_format /= 'pop_nc_ext' .and. &
grid_format /= 'mom_nc' .and. &
grid_format /= 'geosnc' .and. &
grid_format /= 'meshnc' .and. &
Expand Down
2 changes: 1 addition & 1 deletion cicecore/cicedyn/infrastructure/comm/serial/ice_boundary.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ subroutine ice_HaloUpdate2DR8(array, halo, &
!-----------------------------------------------------------------------

if (.not. ltripoleOnly) then
! tripoleOnly skip fill, do not overwrite any values in interior as they may
! tripoleOnly skip fill, do not overwrite any values in interior as they may
! already be set and filling tripole is not necessary

! fill outer boundary as needed
Expand Down
2 changes: 1 addition & 1 deletion cicecore/cicedyn/infrastructure/ice_blocks.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ subroutine create_blocks(nx_global, ny_global, ew_boundary_type, &
! the global index will go from -nghost+1:0 on the lower boundary
! and n*_global+1:n*_global+nghost on the upper boundary and the
! haloUpdate and scatter, for instance, will not fill those values
! in those cases. Other boundary condition methods will fill the
! in those cases. Other boundary condition methods will fill the
! outer halo values in cases where ice exists on those boundaries.
!
!----------------------------------------------------------------------
Expand Down
Loading