Skip to content

Fix some initialization of CD variables. #27

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
apcraig merged 5 commits into from
Nov 19, 2021
Merged

Fix some initialization of CD variables. #27

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
341a0b7
Fix some variables initialization on CD variables.
dabail10 Nov 18, 2021
446ee0b
Combine iblk loops
dabail10 Nov 18, 2021
c682189
Fix some arrangement and alignment
dabail10 Nov 18, 2021
42829fb
Need to add grid_system
dabail10 Nov 18, 2021
6057724
add wtmp to OMP PRIVATE
dabail10 Nov 18, 2021
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
14 changes: 1 addition & 13 deletions cicecore/cicedynB/dynamics/ice_dyn_evp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ subroutine evp (dt)
call grid_average_X2Y('T2EF',tmass,emass)
call grid_average_X2Y('T2EF',aice_init, aie)
call grid_average_X2Y('T2NF',tmass,nmass)
call grid_average_X2Y('T2NF',aice_init, aie)
call grid_average_X2Y('T2NF',aice_init, ain)
endif
!----------------------------------------------------------------
! Set wind stress to values supplied via NEMO or other forcing
Expand Down Expand Up @@ -420,22 +420,10 @@ subroutine evp (dt)
uvelN (:,:,iblk), vvelN (:,:,iblk), &
TbN (:,:,iblk))

enddo ! iblk
!$TCXOMP END PARALLEL DO

!$TCXOMP PARALLEL DO PRIVATE(iblk,ilo,ihi,jlo,jhi,this_block)
do iblk = 1, nblocks

!-----------------------------------------------------------------
! more preparation for dynamics on E grid
!-----------------------------------------------------------------

this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
ihi = this_block%ihi
jlo = this_block%jlo
jhi = this_block%jhi

call dyn_prep2 (nx_block, ny_block, &
ilo, ihi, jlo, jhi, &
icellt(iblk), icelle(iblk), &
Expand Down
27 changes: 19 additions & 8 deletions cicecore/cicedynB/general/ice_flux.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ subroutine init_coupler_flux
use ice_flux_bgc, only: flux_bio_atm, flux_bio, faero_atm, fiso_atm, &
fnit, famm, fsil, fdmsp, fdms, fhum, fdust, falgalN, &
fdoc, fdon, fdic, ffed, ffep
use ice_grid, only: bathymetry
use ice_grid, only: bathymetry, grid_system

integer (kind=int_kind) :: n

Expand Down Expand Up @@ -738,13 +738,24 @@ subroutine init_coupler_flux
! fluxes received from ocean
!-----------------------------------------------------------------

ss_tltx(:,:,:)= c0 ! sea surface tilt (m/m)
ss_tlty(:,:,:)= c0
uocn (:,:,:) = c0 ! surface ocean currents (m/s)
vocn (:,:,:) = c0
frzmlt(:,:,:) = c0 ! freezing/melting potential (W/m^2)
frzmlt_init(:,:,:) = c0 ! freezing/melting potential (W/m^2)
sss (:,:,:) = 34.0_dbl_kind ! sea surface salinity (ppt)
ss_tltx (:,:,:) = c0 ! sea surface tilt (m/m)
ss_tlty (:,:,:) = c0
uocn (:,:,:) = c0 ! surface ocean currents (m/s)
vocn (:,:,:) = c0
frzmlt (:,:,:) = c0 ! freezing/melting potential (W/m^2)
frzmlt_init(:,:,:) = c0 ! freezing/melting potential (W/m^2)
sss (:,:,:) = 34.0_dbl_kind ! sea surface salinity (ppt)

if (grid_system == 'CD') then
ss_tltxN(:,:,:) = c0 ! sea surface tilt (m/m)
ss_tltyN(:,:,:) = c0
ss_tltxE(:,:,:) = c0 ! sea surface tilt (m/m)
ss_tltyE(:,:,:) = c0
uocnN (:,:,:) = c0 ! surface ocean currents (m/s)
vocnN (:,:,:) = c0
uocnE (:,:,:) = c0 ! surface ocean currents (m/s)
vocnE (:,:,:) = c0
endif

do iblk = 1, size(Tf,3)
do j = 1, size(Tf,2)
Expand Down
16 changes: 8 additions & 8 deletions cicecore/cicedynB/infrastructure/ice_grid.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2437,7 +2437,7 @@ subroutine grid_average_X2YS(dir,work1,area1,mask1,work2)
select case (trim(dir))

case('NE')
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block,wtmp)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand All @@ -2462,7 +2462,7 @@ subroutine grid_average_X2YS(dir,work1,area1,mask1,work2)
!$OMP END PARALLEL DO

case('SW')
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block,wtmp)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand All @@ -2487,7 +2487,7 @@ subroutine grid_average_X2YS(dir,work1,area1,mask1,work2)
!$OMP END PARALLEL DO

case('NW')
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block,wtmp)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand All @@ -2512,7 +2512,7 @@ subroutine grid_average_X2YS(dir,work1,area1,mask1,work2)
!$OMP END PARALLEL DO

case('SE')
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block,wtmp)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand All @@ -2537,7 +2537,7 @@ subroutine grid_average_X2YS(dir,work1,area1,mask1,work2)
!$OMP END PARALLEL DO

case('E')
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block,wtmp)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand All @@ -2558,7 +2558,7 @@ subroutine grid_average_X2YS(dir,work1,area1,mask1,work2)
!$OMP END PARALLEL DO

case('W')
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block,wtmp)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand All @@ -2579,7 +2579,7 @@ subroutine grid_average_X2YS(dir,work1,area1,mask1,work2)
!$OMP END PARALLEL DO

case('N')
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block,wtmp)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand All @@ -2600,7 +2600,7 @@ subroutine grid_average_X2YS(dir,work1,area1,mask1,work2)
!$OMP END PARALLEL DO

case('S')
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block,wtmp)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand Down