Skip to content

Commit

Permalink
remove compiler warnings for CICE; fix missing j-loop index (NOAA-EMC#75
Browse files Browse the repository at this point in the history
)

* fix dummy arguments w/o values
* fix missing j-loop in export 4d
  • Loading branch information
DeniseWorthen committed May 10, 2024
1 parent dce4a59 commit 1c6763a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
8 changes: 5 additions & 3 deletions cicecore/drivers/nuopc/cmeps/ice_import_export.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1773,9 +1773,11 @@ subroutine state_setexport_4d(state, fldname, input, index, lmask, ifrac, ungrid
end do
end do
else
do i = ilo, ihi
n = n+1
dataPtr1d(n) = input(i,j,index,iblk)
do j = jlo, jhi
do i = ilo, ihi
n = n+1
dataPtr1d(n) = input(i,j,index,iblk)
end do
end do
end if
end do
Expand Down
4 changes: 3 additions & 1 deletion cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ module ice_prescribed_mod
! Ice/ocean fluxes are set to zero, and ice dynamics are not calculated.
! Regridding and data cycling capabilities are included.

use ESMF
use ESMF, only : ESMF_Clock, ESMF_Mesh, ESMF_SUCCESS, ESMF_FAILURE
use ESMF, only : ESMF_LogFoundError, ESMF_LOGERR_PASSTHRU, ESMF_Finalize, ESMF_END_ABORT

#ifndef CESMCOUPLED

Expand All @@ -23,6 +24,7 @@ subroutine ice_prescribed_init(clock, mesh, rc)
type(ESMF_Mesh) , intent(in) :: mesh
integer , intent(out) :: rc
! do nothing
rc = ESMF_SUCCESS
end subroutine ice_prescribed_init

#else
Expand Down
2 changes: 1 addition & 1 deletion cicecore/shared/ice_init_column.F90
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ subroutine init_bgc()

endif ! .not. restart

!$OMP PARALLEL DO PRIVATE(iblk,i,j,k,n,ilo,ihi,jlo,jhi,this_block)
!$OMP PARALLEL DO PRIVATE(iblk,i,j,n,ilo,ihi,jlo,jhi,this_block)
do iblk = 1, nblocks

this_block = get_block(blocks_ice(iblk),iblk)
Expand Down

0 comments on commit 1c6763a

Please sign in to comment.