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

Integrate evp1d - dont integrate yet #880

Closed
wants to merge 34 commits into from
Closed

Integrate evp1d - dont integrate yet #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7eff6be
implemented 1d evp including debug features in CICE main
TillRasmussen Aug 10, 2023
c9368ad
bugfixes. first version that compiles
TillRasmussen Aug 12, 2023
fe413ff
reorganization of constants
TillRasmussen Aug 17, 2023
ff66667
updates to integration
TillRasmussen Sep 1, 2023
6bea7d8
Merge branch 'CICE-Consortium:main' into integrate_evp1d
TillRasmussen Sep 1, 2023
f40163c
bit for bit integration of v2b on 1 proc
TillRasmussen Sep 5, 2023
9601a28
added omp and numa init
TillRasmussen Sep 5, 2023
faa2716
integrated numainit
TillRasmussen Sep 5, 2023
ee25e7d
added init
TillRasmussen Sep 6, 2023
7a4c465
Updated to v2c
TillRasmussen Sep 11, 2023
b6f5311
Integration of evp1d
TillRasmussen Sep 16, 2023
395fb1a
removed obsolete files
TillRasmussen Sep 16, 2023
b17e5e7
integrated benchmark
TillRasmussen Sep 16, 2023
6bca027
Merge branch 'CICE-Consortium:main' into integrate_evp1d
TillRasmussen Sep 16, 2023
5208b13
implemented 1d evp in CICE main
TillRasmussen Aug 10, 2023
4b1bec1
Update integration
TillRasmussen Aug 17, 2023
c2407de
Updates to advanced snow physics implementation (#852)
eclare108213 Aug 18, 2023
d2d7635
Deprecate zsalinity (#851)
apcraig Aug 22, 2023
493de4f
Extend restart output controls, provide multiple frequency options (#…
apcraig Aug 24, 2023
f5f9e3b
Add logging features to nuopc/cmeps cap; deprecates zsalinity in cap …
DeniseWorthen Aug 28, 2023
405bdbc
Update Icepack to #23b6c1272b50d42ca, Aug 30, 2023 (#857)
apcraig Aug 31, 2023
78d46f6
integrated benchmark
TillRasmussen Sep 16, 2023
f7e69ee
Only print messages in CAP on master task (#861)
dabail10 Sep 5, 2023
b1af309
Update Cheyenne and Derecho ports (#863)
apcraig Sep 7, 2023
a15a131
Update version to 6.4.2 (#864)
apcraig Sep 8, 2023
901eab7
More accurate calculation of areafact in remapping (#849)
JFLemieux73 Sep 15, 2023
edb3ee9
switch to cesm-style field names (#869)
DeniseWorthen Sep 15, 2023
71989dd
Merge branch 'integrate_evp1d' of github.com:TillRasmussen/CICE into …
TillRasmussen Sep 16, 2023
dd62e4a
additional clean if evp 1d
TillRasmussen Sep 16, 2023
7cb818f
remove last integrate cpp
TillRasmussen Sep 16, 2023
419add1
updates
TillRasmussen Oct 5, 2023
fb5ffa5
all test are bit for bit
TillRasmussen Oct 12, 2023
efff18e
convert strintx and strinty to scalars in loop. Added postprocess
TillRasmussen Oct 20, 2023
4bfc3df
clean up of halo
TillRasmussen Oct 22, 2023
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
8 changes: 4 additions & 4 deletions cicecore/cicedyn/analysis/ice_diagnostics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ subroutine total_energy (work)
if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
file=__FILE__, line=__LINE__)

!$OMP PARALLEL DO PRIVATE(iblk,i,j,n,k,ij,icells,indxi,indxj)
!TILL !$OMP PARALLEL DO PRIVATE(iblk,i,j,n,k,ij,icells,indxi,indxj)
do iblk = 1, nblocks

!-----------------------------------------------------------------
Expand Down Expand Up @@ -1502,7 +1502,7 @@ subroutine total_energy (work)
enddo ! n

enddo ! iblk
!$OMP END PARALLEL DO
!TILL !$OMP END PARALLEL DO

end subroutine total_energy

Expand Down Expand Up @@ -1541,7 +1541,7 @@ subroutine total_salt (work)
if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
file=__FILE__, line=__LINE__)

!$OMP PARALLEL DO PRIVATE(iblk,i,j,n,k,ij,icells,indxi,indxj)
!TILL !$OMP PARALLEL DO PRIVATE(iblk,i,j,n,k,ij,icells,indxi,indxj)
do iblk = 1, nblocks

!-----------------------------------------------------------------
Expand Down Expand Up @@ -1578,7 +1578,7 @@ subroutine total_salt (work)
enddo ! n

enddo ! iblk
!$OMP END PARALLEL DO
!TILL !$OMP END PARALLEL DO

end subroutine total_salt

Expand Down
631 changes: 631 additions & 0 deletions cicecore/cicedyn/dynamics/bench_v2c.F90
View file
Open in desktop

Large diffs are not rendered by default.

793 changes: 389 additions & 404 deletions cicecore/cicedyn/dynamics/ice_dyn_evp.F90
View file
Open in desktop

Large diffs are not rendered by default.

1,369 changes: 1,369 additions & 0 deletions cicecore/cicedyn/dynamics/ice_dyn_evp1d.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading