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

Reduce number of calls to calc_ffrac #638

Merged
merged 6 commits into from
Oct 6, 2021
Merged

Reduce number of calls to calc_ffrac #638

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d8dcac
initialized all eap history variables to zero on land
TillRasmussen Sep 10, 2021
f642365
Merge branch 'CICE-Consortium:master' into master
TillRasmussen Sep 10, 2021
7cf0a27
Step_a calls calc_fracv 6 times. This can be reduced to 3 as they 2 a…
TillRasmussen Oct 3, 2021
d95694c
Merge pull request #18 from CICE-Consortium/main
TillRasmussen Oct 3, 2021
6e25b28
removed timers used for testing
TillRasmussen Oct 3, 2021
27aff16
Merge pull request #19 from TillRasmussen/eap
TillRasmussen Oct 3, 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
Prev Previous commit
Next Next commit
removed timers used for testing
  • Loading branch information
@TillRasmussen
TillRasmussen committed Oct 3, 2021
commit 6e25b28d8d0cad930222bd92aef345bab77c468d
39 changes: 22 additions & 17 deletions cicecore/cicedynB/dynamics/ice_dyn_eap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,7 @@ subroutine eap (dt)
! ice_timer_start, ice_timer_stop, &
! timer_tmp1, timer_tmp2, timer_tmp3
use ice_timers, only: timer_dynamics, timer_bound, &
ice_timer_start, ice_timer_stop, &
timer_evp_1d, timer_evp_2d, timer_tmp, timer_tmp2, &
timer_tmp3
ice_timer_start, ice_timer_stop

real (kind=dbl_kind), intent(in) :: &
dt ! time step
Expand Down Expand Up @@ -421,7 +419,7 @@ subroutine eap (dt)
enddo
!$OMP END PARALLEL DO
endif
call ice_timer_start(timer_evp_2d)

do ksub = 1,ndte ! subcycling

!-----------------------------------------------------------------
Expand All @@ -431,7 +429,7 @@ subroutine eap (dt)
!$TCXOMP PARALLEL DO PRIVATE(iblk,strtmp)
do iblk = 1, nblocks

call ice_timer_start(timer_tmp) ! dynamics
! call ice_timer_start(timer_tmp1) ! dynamics
call stress_eap (nx_block, ny_block, &
ksub, ndte, &
icellt(iblk), &
Expand Down Expand Up @@ -464,12 +462,12 @@ subroutine eap (dt)
! rdg_conv (:,:,iblk), rdg_shear (:,:,iblk), &
rdg_conv (:,:,iblk), &
strtmp (:,:,:))
call ice_timer_stop(timer_tmp) ! dynamics
! call ice_timer_stop(timer_tmp1) ! dynamics

!-----------------------------------------------------------------
! momentum equation
!-----------------------------------------------------------------
call ice_timer_start(timer_tmp2) ! dynamics

call stepu (nx_block, ny_block, &
icellu (iblk), Cdn_ocn (:,:,iblk), &
indxui (:,iblk), indxuj (:,iblk), &
Expand All @@ -485,14 +483,13 @@ subroutine eap (dt)
uvel_init(:,:,iblk), vvel_init(:,:,iblk),&
uvel (:,:,iblk), vvel (:,:,iblk), &
Tbu (:,:,iblk))
call ice_timer_stop(timer_tmp2) ! dynamics

!-----------------------------------------------------------------
! evolution of structure tensor A
!-----------------------------------------------------------------

! call ice_timer_start(timer_tmp3) ! dynamics
if (mod(ksub,10) == 1) then ! only called every 10th timestep
call ice_timer_start(timer_evp_1d)
call stepa (nx_block, ny_block, &
dtei, icellt (iblk), &
indxti (:,iblk), indxtj (:,iblk), &
Expand All @@ -507,26 +504,25 @@ subroutine eap (dt)
stressm_3(:,:,iblk), stressm_4(:,:,iblk), &
stress12_1(:,:,iblk), stress12_2(:,:,iblk), &
stress12_3(:,:,iblk), stress12_4(:,:,iblk))
call ice_timer_stop(timer_evp_1d)
endif
! call ice_timer_stop(timer_tmp3) ! dynamics
enddo
!$TCXOMP END PARALLEL DO
call ice_timer_start(timer_tmp3)

call stack_velocity_field(uvel, vvel, fld2)
! call ice_timer_start(timer_bound)
call ice_timer_start(timer_bound)
if (maskhalo_dyn) then
call ice_HaloUpdate (fld2, halo_info_mask, &
field_loc_NEcorner, field_type_vector)
else
call ice_HaloUpdate (fld2, halo_info, &
field_loc_NEcorner, field_type_vector)
endif
! call ice_timer_stop(timer_bound)
call ice_timer_stop(timer_bound)
call unstack_velocity_field(fld2, uvel, vvel)
call ice_timer_stop(timer_tmp3)

enddo ! subcycling
call ice_timer_stop(timer_evp_2d)

deallocate(fld2)
if (maskhalo_dyn) call ice_HaloDestroy(halo_info_mask)

Expand Down Expand Up @@ -1942,6 +1938,7 @@ subroutine stepa (nx_block, ny_block, &
i = indxti(ij)
j = indxtj(ij)

! ne
call calc_ffrac(stressp_1(i,j), stressm_1(i,j), &
stress12_1(i,j), &
a11_1(i,j), a12_1(i,j), &
Expand All @@ -1951,6 +1948,7 @@ subroutine stepa (nx_block, ny_block, &
a12_1(i,j) = (a12_1(i,j)*dtei - mresult12) * dteikth ! implicit


! nw
call calc_ffrac(stressp_2(i,j), stressm_2(i,j), &
stress12_2(i,j), &
a11_2(i,j), a12_2(i,j), &
Expand All @@ -1959,7 +1957,7 @@ subroutine stepa (nx_block, ny_block, &
a11_2(i,j) = (a11_2(i,j)*dtei + p5kth - mresult11) * dteikth ! implicit
a12_2(i,j) = (a12_2(i,j)*dtei - mresult12) * dteikth ! implicit


! sw
call calc_ffrac(stressp_3(i,j), stressm_3(i,j), &
stress12_3(i,j), &
a11_3(i,j), a12_3(i,j), &
Expand All @@ -1968,6 +1966,7 @@ subroutine stepa (nx_block, ny_block, &
a11_3(i,j) = (a11_3(i,j)*dtei + p5kth - mresult11) * dteikth ! implicit
a12_3(i,j) = (a12_3(i,j)*dtei - mresult12) * dteikth ! implicit

! se
call calc_ffrac(stressp_4(i,j), stressm_4(i,j), &
stress12_4(i,j), &
a11_4(i,j), a12_4(i,j), &
Expand Down Expand Up @@ -2071,7 +2070,13 @@ subroutine calc_ffrac (stressp, stressm, &
mresult2 = c0
endif

end subroutine calc_ffrac_v2
end subroutine calc_ffrac

!=======================================================================
!---! these subroutines write/read Fortran unformatted data files ..
!=======================================================================

! Dumps all values needed for a restart

subroutine write_restart_eap ()

Expand Down