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

Update CICE #54

Merged
merged 42 commits into from
Nov 25, 2022
Merged

Update CICE #54

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d088bfb
Update some CICE variable names to clarify grid (#729)
apcraig Jul 15, 2022
1585c31
Add unit test for optional arguments, "optargs" (#730)
apcraig Jul 15, 2022
21bd95b
cice.setup: remove 'suite.jobs' at start of 'suite.submit' (#731)
phil-blain Jul 15, 2022
9be1c35
Deprecate CESM ponds (tr_pond_cesm) (#733)
dabail10 Jul 31, 2022
3af3d1b
Deprecate 0-layer thermodynamics in the CICE driver (#732)
eclare108213 Jul 31, 2022
c6470cf
Update icepack to 3cb1746a202615044e (#743)
apcraig Jul 31, 2022
063a7f2
Update cice.t-test.py to use cartopy instead of basemap. (#742)
apcraig Jul 31, 2022
731c61d
change visc_method default to avg_zeta, change alt07 to test avg_stre…
apcraig Aug 2, 2022
26db2c3
cice.setup: allow command line to override suite options (#745)
phil-blain Aug 2, 2022
5a1701c
Update Icepack and version number (#748)
apcraig Aug 4, 2022
08c6b33
ice_grid: do call 'gridbox_verts' for rectangular grids (#749)
phil-blain Aug 12, 2022
d673e44
Clean up code and add several minor features (#750)
apcraig Aug 15, 2022
75ef5d2
Update ECCC machine files (#751)
phil-blain Aug 17, 2022
fea412a
ice_calendar: zero-initialize 'nstreams' (#752)
phil-blain Aug 17, 2022
1f70caf
Merge remote-tracking branch 'Consortium/main' into feature/updcice
DeniseWorthen Aug 20, 2022
c87dcd3
Added dxgrow, dygrow to facilitate variable spaced grid. Modified rec…
daveh150 Aug 22, 2022
2d0b213
Update Pull Request Template, add question about updating Icepack (#754)
apcraig Aug 23, 2022
588a86f
Refactored evp sub cycling loop (#756)
TillRasmussen Aug 24, 2022
007fbff
ice_grid: initialize 'l_readCenter' for all grid types (#758)
phil-blain Aug 24, 2022
6587995
move deformation out of loop for B grid only (#755)
TillRasmussen Sep 22, 2022
6399af7
Update dEdd implementation (#760)
apcraig Sep 29, 2022
036f1f7
Update grid averaging for tmass, aice, uvelT, vvelT (#762)
apcraig Sep 29, 2022
422117f
doc: improve "Quick Start" section (#765)
phil-blain Oct 6, 2022
8c6ba04
Refactor strocnxT, strocnyT implementation (#764)
apcraig Oct 10, 2022
578c111
ice_init: do broadcast 'default_season' (#766)
phil-blain Oct 11, 2022
af8cc84
Correct units in FSD history output (#769)
lettie-roach Oct 11, 2022
6a62a11
Update box test options (#772)
apcraig Oct 14, 2022
0447b9e
Update computation of cdn_ocn for use in dynamics (#771)
apcraig Oct 14, 2022
2435fa7
Change icetmask to logical consistent with iceumask, icenmask, iceema…
apcraig Oct 17, 2022
16b78da
ice_dyn_vp: allow for bit-for-bit reproducibility under `bfbflag` (#774)
phil-blain Oct 20, 2022
db2d7a9
Update Narwhal Port (#776)
apcraig Oct 20, 2022
670d2f2
Add time-varying wave forcing, add warning for FSD without waves, mak…
lettie-roach Nov 1, 2022
3820cde
Port to gust intel and cray (#781)
apcraig Nov 1, 2022
d6d081a
Merge branch 'emc/develop' into feature/updcice
DeniseWorthen Nov 2, 2022
2e68b9e
Merge remote-tracking branch 'Consortium/main' into feature/updcice
DeniseWorthen Nov 2, 2022
b893ee9
add initializationsin ice_state
DeniseWorthen Nov 2, 2022
aa1e066
Update KE diagnostic (#784)
apcraig Nov 7, 2022
251ca48
Add wave-ice coupling to nuopc/cmeps driver (#782)
DeniseWorthen Nov 8, 2022
b11bfb4
Merge remote-tracking branch 'Consortium/main' into feature/updcice
DeniseWorthen Nov 8, 2022
5a32f12
finalize 0-layer thermo and cesm ponds deprecation in CICE (#787)
eclare108213 Nov 16, 2022
9808b51
CESM Updates (#785)
dabail10 Nov 16, 2022
fe16051
Merge remote-tracking branch 'Consortium/main' into feature/updcice
DeniseWorthen Nov 16, 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
Prev Previous commit
Next Next commit
Refactored evp sub cycling loop (CICE-Consortium#756) 
* Refactored evp sub cycling loop

* corrected indent and case for dyn_haloUptdate
  • Loading branch information
@TillRasmussen
TillRasmussen authored Aug 24, 2022
commit 588a86f62be2734281c8876249133f4c4e7a276d
66 changes: 43 additions & 23 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, &
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 All @@ -837,7 +848,7 @@ subroutine evp (dt)
!$OMP END PARALLEL DO

! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_NEcorner, field_type_scalar, &
shearU)

Expand Down Expand Up @@ -877,7 +888,7 @@ subroutine evp (dt)
!$OMP END PARALLEL DO

! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_center, field_type_scalar, &
zetax2T, etax2T, stresspT, stressmT)

Expand All @@ -900,7 +911,7 @@ subroutine evp (dt)
!$OMP END PARALLEL DO

! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info , halo_info_mask, &
call dyn_haloUpdate (halo_info , halo_info_mask, &
field_loc_NEcorner, field_type_scalar, &
stress12U)

Expand Down Expand Up @@ -958,10 +969,10 @@ subroutine evp (dt)
!$OMP END PARALLEL DO

! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_Eface, field_type_vector, &
uvelE)
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_Nface, field_type_vector, &
vvelN)

Expand All @@ -971,10 +982,10 @@ subroutine evp (dt)
vvelE(:,:,:) = vvelE(:,:,:)*epm(:,:,:)

! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_Nface, field_type_vector, &
uvelN)
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_Eface, field_type_vector, &
vvelE)

Expand All @@ -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 @@ -1020,7 +1040,7 @@ subroutine evp (dt)
!$OMP END PARALLEL DO

! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_center, field_type_scalar, &
zetax2T, etax2T)

Expand Down Expand Up @@ -1065,10 +1085,10 @@ subroutine evp (dt)
!$OMP END PARALLEL DO

! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_center, field_type_scalar, &
stresspT, stressmT, stress12T)
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_NEcorner,field_type_scalar, &
stresspU, stressmU, stress12U)

Expand Down Expand Up @@ -1148,10 +1168,10 @@ subroutine evp (dt)
!$OMP END PARALLEL DO

! calls ice_haloUpdate, controls bundles and masks
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_Eface, field_type_vector, &
uvelE, vvelE)
call dyn_HaloUpdate (halo_info, halo_info_mask, &
call dyn_haloUpdate (halo_info, halo_info_mask, &
field_loc_Nface, field_type_vector, &
uvelN, vvelN)

Expand All @@ -1160,16 +1180,16 @@ 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)

endif ! grid_ice
enddo ! subcycling

! 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)
endif ! grid_ice

enddo ! subcycling
call ice_timer_stop(timer_evp_2d)
endif ! evp_algorithm

Expand Down