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.

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

Hycom forcing v2 + small adds / corrections #230

Merged
merged 5 commits into from
Nov 16, 2018
Merged
Changes from 1 commit
Commits
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
Next Next commit
Record number for popgrid_nc (NetCDF) is always one
  • Loading branch information
mhrib committed Nov 6, 2018
commit d4888eee48ec117555bea439132ba80314148bb0
16 changes: 8 additions & 8 deletions cicecore/cicedynB/infrastructure/ice_grid.F90
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ subroutine init_grid2

type (block) :: &
this_block ! block information for current block

character(len=*), parameter :: subname = '(init_grid2)'

!-----------------------------------------------------------------
Expand Down Expand Up @@ -719,13 +719,13 @@ subroutine popgrid_nc
integer (kind=int_kind) :: &
i, j, iblk, &
ilo,ihi,jlo,jhi, & ! beginning and end of physical domain
fid_grid, & ! file id for netCDF grid file
fid_kmt ! file id for netCDF kmt file
fid_grid, & ! file id for netCDF grid file
fid_kmt ! file id for netCDF kmt file

logical (kind=log_kind) :: diag

character (char_len) :: &
fieldname ! field name in netCDF file
fieldname ! field name in netCDF file

real (kind=dbl_kind) :: &
pi
Expand Down Expand Up @@ -794,15 +794,15 @@ subroutine popgrid_nc
ew_boundary_type, ns_boundary_type)

fieldname='ulon'
call ice_read_global_nc(fid_grid,2,fieldname,work_g1,diag) ! ULON
call ice_read_global_nc(fid_grid,1,fieldname,work_g1,diag) ! ULON
call gridbox_verts(work_g1,lont_bounds)
call scatter_global(ULON, work_g1, master_task, distrb_info, &
field_loc_NEcorner, field_type_scalar)
call ice_HaloExtrapolate(ULON, distrb_info, &
ew_boundary_type, ns_boundary_type)

fieldname='angle'
call ice_read_global_nc(fid_grid,7,fieldname,work_g1,diag) ! ANGLE
call ice_read_global_nc(fid_grid,1,fieldname,work_g1,diag) ! ANGLE
call scatter_global(ANGLE, work_g1, master_task, distrb_info, &
field_loc_NEcorner, field_type_angle)

Expand All @@ -817,11 +817,11 @@ subroutine popgrid_nc
!-----------------------------------------------------------------

fieldname='htn'
call ice_read_global_nc(fid_grid,3,fieldname,work_g1,diag) ! HTN
call ice_read_global_nc(fid_grid,1,fieldname,work_g1,diag) ! HTN
call primary_grid_lengths_HTN(work_g1) ! dxu, dxt

fieldname='hte'
call ice_read_global_nc(fid_grid,4,fieldname,work_g1,diag) ! HTE
call ice_read_global_nc(fid_grid,1,fieldname,work_g1,diag) ! HTE
call primary_grid_lengths_HTE(work_g1) ! dyu, dyt

deallocate(work_g1)
Expand Down