Skip to content

Commit

Permalink
additional changes to have mom cap nuopc working without a lot of dia…
Browse files Browse the repository at this point in the history 
…gnostic output
  • Loading branch information
Mariana Vertenstein committed Jun 5, 2018
1 parent f3ca0c8 commit 50e4a65
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 96 deletions.
4 changes: 4 additions & 0 deletions config_src/nuopc_driver/mom_cap.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,11 @@ module mom_cap_mod
integer :: dbrc

type(ESMF_Grid) :: mom_grid_i
#ifdef CESMCOUPLED
logical :: write_diagnostics = .false.
#else
logical :: write_diagnostics = .true.
#endif
logical :: profile_memory = .true.
logical :: ocean_solo = .true.
logical :: grid_attach_area = .false.
Expand Down
123 changes: 27 additions & 96 deletions config_src/nuopc_driver/mom_cap_methods.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,34 +141,34 @@ subroutine ocn_export(ocean_public, grid, exportState, rc)
call mpp_get_compute_domain(ocean_public%domain, isc, iec, jsc, jec)

!tcx
! write(tmpstr,'(a,6i8)') subname//'tcx1',lbnd1,ubnd1,lbnd2,ubnd2
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx2',isc,iec,jsc,jec
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx3_1',lbound(ssh,1),ubound(ssh,1)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx3_2',lbound(ssh,2),ubound(ssh,2)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx4_1',lbound(ocean_public%sea_lev,1),ubound(ocean_public%sea_lev,1)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx4_2',lbound(ocean_public%sea_lev,2),ubound(ocean_public%sea_lev,2)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx5_1',lbound(grid%mask2dT,1),ubound(grid%mask2dT,1)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx5_2',lbound(grid%mask2dT,2),ubound(grid%mask2dT,2)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx6',grid%isd,grid%ied,grid%jsd,grid%jed
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx7',grid%isc,grid%iec,grid%jsc,grid%jec
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx8',grid%idg_offset, grid%jdg_offset
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx9_1',lbound(dataPtr_omask,1),ubound(dataPtr_omask,1)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx9_2',lbound(dataPtr_omask,2),ubound(dataPtr_omask,2)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx1',lbnd1,ubnd1,lbnd2,ubnd2
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx2',isc,iec,jsc,jec
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx3_1',lbound(ssh,1),ubound(ssh,1)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx3_2',lbound(ssh,2),ubound(ssh,2)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx4_1',lbound(ocean_public%sea_lev,1),ubound(ocean_public%sea_lev,1)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx4_2',lbound(ocean_public%sea_lev,2),ubound(ocean_public%sea_lev,2)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx5_1',lbound(grid%mask2dT,1),ubound(grid%mask2dT,1)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx5_2',lbound(grid%mask2dT,2),ubound(grid%mask2dT,2)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx6',grid%isd,grid%ied,grid%jsd,grid%jed
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx7',grid%isc,grid%iec,grid%jsc,grid%jec
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx8',grid%idg_offset, grid%jdg_offset
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx9_1',lbound(dataPtr_omask,1),ubound(dataPtr_omask,1)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
! write(tmpstr,'(a,6i8)') subname//'tcx9_2',lbound(dataPtr_omask,2),ubound(dataPtr_omask,2)
! call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO, rc=dbrc)
!tcx

!Copy from ocean_public to exportstate. ocean_public uses global indexing with no halos.
!The mask comes from "grid" that uses the usual MOM domain that has halos
!and does not use global indexing.
Expand All @@ -191,10 +191,6 @@ subroutine ocn_export(ocean_public, grid, exportState, rc)
end do
end do

!dataPtr_dhdx(:,:) = 0.
!dataPtr_dhdy(:,:) = 0.
!ssh(:,:) = 0.

! Make a copy of ssh in order to do a halo update. We use the usual MOM domain
! in order to update halos. i.e. does not use global indexing.
do j=grid%jsc, grid%jec
Expand Down Expand Up @@ -273,71 +269,6 @@ subroutine ocn_export(ocean_public, grid, exportState, rc)
end do
end do

!!$ ! Update halo of ssh so we can calculate gradients
!!$ call pass_var(ssh, grid%domain)
!!$
!!$ ! d/dx ssh
!!$ do j=grid%jsc, grid%jec
!!$ j1 = j + lbnd2 - grid%jsc
!!$ do i=grid%isc,grid%iec
!!$ i1 = i + lbnd1 - grid%isc
!!$ ! This is a simple second-order difference
!!$ ! dataPtr_dhdx(i1,j1) = 0.5 * (ssh(i+1,j) - ssh(i-1,j)) * grid%IdxT(i,j) * grid%mask2dT(ig,jg)
!!$ ! This is a PLM slope which might be less prone to the A-grid null mode
!!$ slp_L = (ssh(i,j) - ssh(i-1,j)) * grid%mask2dCu(i-1,j)
!!$ if (grid%mask2dCu(i-1,j)==0.) slp_L = 0.
!!$
!!$ slp_R = (ssh(i+1,j) - ssh(i,j)) * grid%mask2dCu(i,j)
!!$ if (grid%mask2dCu(i+1,j)==0.) slp_R = 0.
!!$
!!$ slp_C = 0.5 * (slp_L + slp_R)
!!$ if ( (slp_L * slp_R) > 0.0 ) then
!!$ ! This limits the slope so that the edge values are bounded by the
!!$ ! two cell averages spanning the edge.
!!$ u_min = min( ssh(i-1,j), ssh(i,j), ssh(i+1,j) )
!!$ u_max = max( ssh(i-1,j), ssh(i,j), ssh(i+1,j) )
!!$ slope = sign( min( abs(slp_C), 2.*min( ssh(i,j) - u_min, u_max - ssh(i,j) ) ), slp_C )
!!$ else
!!$ ! Extrema in the mean values require a PCM reconstruction avoid generating
!!$ ! larger extreme values.
!!$ slope = 0.0
!!$ end if
!!$ dataPtr_dhdx(i1,j1) = slope * grid%IdxT(i,j) * grid%mask2dT(ig,jg)
!!$ if (grid%mask2dT(ig,jg)==0.) dataPtr_dhdx(i1,j1) = 0.0
!!$ end do
!!$ end do
!!$
!!$ ! d/dy ssh
!!$ do j=grid%jsc, grid%jec
!!$ j1 = j + lbnd2 - grid%jsc
!!$ do i=grid%isc,grid%iec
!!$ i1 = i + lbnd1 - grid%isc
!!$ ! This is a simple second-order difference
!!$ ! dataPtr_dhdy(i1,j1) = 0.5 * (ssh(i,j+1) - ssh(i,j-1)) * grid%IdyT(i,j) * grid%mask2dT(ig,jg)
!!$ ! This is a PLM slope which might be less prone to the A-grid null mode
!!$ slp_L = ssh(i,j) - ssh(i,j-1) * grid%mask2dCv(i,j-1)
!!$ if (grid%mask2dCv(i,j-1)==0.) slp_L = 0.
!!$
!!$ slp_R = ssh(i,j+1) - ssh(i,j) * grid%mask2dCv(i,j)
!!$ if (grid%mask2dCv(i,j+1)==0.) slp_R = 0.
!!$
!!$ slp_C = 0.5 * (slp_L + slp_R)
!!$ if ((slp_L * slp_R) > 0.0) then
!!$ ! This limits the slope so that the edge values are bounded by the
!!$ ! two cell averages spanning the edge.
!!$ u_min = min( ssh(i,j-1), ssh(i,j), ssh(i,j+1) )
!!$ u_max = max( ssh(i,j-1), ssh(i,j), ssh(i,j+1) )
!!$ slope = sign( min( abs(slp_C), 2.*min( ssh(i,j) - u_min, u_max - ssh(i,j) ) ), slp_C )
!!$ else
!!$ ! Extrema in the mean values require a PCM reconstruction avoid generating
!!$ ! larger extreme values.
!!$ slope = 0.0
!!$ end if
!!$ dataPtr_dhdy(i1,j1) = slope * grid%IdyT(i,j) * grid%mask2dT(ig,jg)
!!$ if (grid%mask2dT(ig,jg)==0.) dataPtr_dhdy(i1,j1) = 0.0
!!$ end do
!!$ end do

end subroutine ocn_export

!-----------------------------------------------------------------------
Expand Down

0 comments on commit 50e4a65

Please sign in to comment.