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

Some small CESM updates. #812

Merged
merged 6 commits into from
Feb 1, 2023
Merged

Some small CESM updates. #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d1bdce
Fix OMP setup
dabail10 Dec 14, 2022
d7988c9
Update meshgrid
dabail10 Dec 15, 2022
ba41597
Merge branch 'CICE-Consortium:main' into cesm_updates
dabail10 Dec 19, 2022
8c5872a
Merge branch 'CICE-Consortium:main' into cesm_updates
dabail10 Jan 26, 2023
8afd0be
Small updates for CESM
dabail10 Jan 26, 2023
14e0b91
Add change for UFS
dabail10 Jan 26, 2023
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
1 change: 0 additions & 1 deletion cicecore/cicedyn/infrastructure/ice_grid.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,6 @@ subroutine init_grid2
! Diagnose OpenMP thread schedule, force order in output
!-----------------------------------------------------------------

! This code does not work in CESM. Needs to be investigated further.
#if defined (_OPENMP)
!$OMP PARALLEL DO ORDERED PRIVATE(iblk) SCHEDULE(runtime)
do iblk = 1, nblocks
Expand Down
6 changes: 6 additions & 0 deletions cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,9 @@ subroutine read_restart_field(nu,nrec,work,atype,vname,ndim3,diag, &
! if (ndim3 == ncat .and. ncat>1) then
if (ndim3 == ncat .and. ndims == 3) then
call pio_read_darray(File, vardesc, iodesc3d_ncat, work, status)
#ifdef CESMCOUPLED
where (work == PIO_FILL_DOUBLE) work = c0
#endif
if (present(field_loc)) then
do n=1,ndim3
call ice_HaloUpdate (work(:,:,n,:), halo_info, &
Expand All @@ -758,6 +761,9 @@ subroutine read_restart_field(nu,nrec,work,atype,vname,ndim3,diag, &
! elseif (ndim3 == 1) then
elseif (ndim3 == 1 .and. ndims == 2) then
call pio_read_darray(File, vardesc, iodesc2d, work, status)
#ifdef CESMCOUPLED
where (work == PIO_FILL_DOUBLE) work = c0
#endif
if (present(field_loc)) then
call ice_HaloUpdate (work(:,:,1,:), halo_info, &
field_loc, field_type)
Expand Down
2 changes: 0 additions & 2 deletions cicecore/shared/ice_fileunits.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,8 @@ module ice_fileunits
integer (kind=int_kind), public :: &
nu_diag = ice_stdout ! diagnostics output file, unit number may be overwritten

#ifdef CESMCOUPLED
logical (kind=log_kind), public :: &
nu_diag_set = .false. ! flag to indicate whether nu_diag is already set
#endif

integer (kind=int_kind), public :: &
ice_IOUnitsMinUnit = 11, & ! do not use unit numbers below
Expand Down