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

Refactored evp sub cycling loop #756

Merged
merged 2 commits into from
Aug 24, 2022
Merged

Refactored evp sub cycling loop #756

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91b671c
Refactored evp sub cycling loop
TillRasmussen Aug 22, 2022
115d83d
corrected indent and case for dyn_haloUptdate
TillRasmussen Aug 24, 2022
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
42 changes: 31 additions & 11 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 @@ -745,9 +745,10 @@ subroutine evp (dt)
else ! evp_algorithm == standard_2d (Standard CICE)

call ice_timer_start(timer_evp_2d)
do ksub = 1,ndte ! subcycling

if (grid_ice == "B") then
if (grid_ice == "B") then

do ksub = 1,ndte ! subcycling

!$OMP PARALLEL DO PRIVATE(iblk,strtmp) SCHEDULE(runtime)
do iblk = 1, nblocks
Expand Down Expand Up @@ -810,7 +811,17 @@ subroutine evp (dt)
enddo ! iblk
!$OMP END PARALLEL DO

elseif (grid_ice == "C") then
! U fields at NE corner
! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not something new in this PR, but I'm noticing that all calls to dyn_haloUpdate in ice_dyn_evp::evp use this capitalization: dyn_HaloUpdate (with a capital H), whereas the subroutine is defined in ice_dyn_shared as dyn_haloUpdate (small h). Not that big of a deal but it could be nice to fix that .

Copy link
Contributor Author

@TillRasmussen TillRasmussen Aug 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which is preferred?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if we have a firm standard or not. but for now I think we should use the case that is used when defining the subroutine (dyn_haloUpdate).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not too worried about this, but happy to go the way @phil-blain suggests.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with @phil-blain, it's better to be consistent to make grepping just a little easier. We aren't completely consistent now but can work toward it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grep and git grep were exactly what I had in mind when mentioning it (in fact that's how I noticed!)

field_loc_NEcorner, field_type_vector, &
uvel, vvel)

enddo ! sub cycling

elseif (grid_ice == "C") then

do ksub = 1,ndte ! subcycling

!$OMP PARALLEL DO PRIVATE(iblk)
do iblk = 1, nblocks
Expand Down Expand Up @@ -983,8 +994,17 @@ subroutine evp (dt)

uvel(:,:,:) = uvel(:,:,:)*uvm(:,:,:)
vvel(:,:,:) = vvel(:,:,:)*uvm(:,:,:)
! U fields at NE corner
! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
field_loc_NEcorner, field_type_vector, &
uvel, vvel)

enddo ! subcycling

elseif (grid_ice == "CD") then

elseif (grid_ice == "CD") then
do ksub = 1,ndte ! subcycling

!$OMP PARALLEL DO PRIVATE(iblk)
do iblk = 1, nblocks
Expand Down Expand Up @@ -1160,16 +1180,16 @@ subroutine evp (dt)

uvel(:,:,:) = uvel(:,:,:)*uvm(:,:,:)
vvel(:,:,:) = vvel(:,:,:)*uvm(:,:,:)

endif ! grid_ice

! U fields at NE corner
! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
! U fields at NE corner
! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
field_loc_NEcorner, field_type_vector, &
uvel, vvel)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same alignment fix needed here (I can't do a "Suggested change" since some lines are in the context).


enddo ! subcycling
enddo ! subcycling

endif ! grid_ice

call ice_timer_stop(timer_evp_2d)
endif ! evp_algorithm

Expand Down