Skip to content
Snippets Groups Projects
Commit defedef7 authored by Guillaume Samson's avatar Guillaume Samson :snowman2:
Browse files

Merge branch...

Merge branch '8-explicit-use-of-ssh-in-hpg_djc-no-matter-linear-non-linear-free-surface' into 'main'

Fixes issue #8

Closes #8

See merge request nemo/nemo!31
parents b10ff249 993a3f28
No related branches found
No related tags found
No related merge requests found
...@@ -760,11 +760,11 @@ CONTAINS ...@@ -760,11 +760,11 @@ CONTAINS
!------------------------------------------------------------- !-------------------------------------------------------------
! *** AY note: ssh(ji,jj,Kmm) + gde3w(ji,jj,1) = e3w(ji,jj,1,Kmm) ! *** AY note: ssh(ji,jj,Kmm) + gde3w(ji,jj,1) = e3w(ji,jj,1,Kmm)
DO_2D( 0, 1, 0, 1) DO_2D( 0, 1, 0, 1)
z_rho_k(ji,jj,1) = grav * ( ssh(ji,jj,Kmm) + gde3w(ji,jj,1) ) & z_rho_k(ji,jj,1) = grav * gdept(ji,jj,1,Kmm) &
& * ( rhd(ji,jj,1) & & * ( rhd(ji,jj,1) &
& + 0.5_wp * ( rhd (ji,jj,2) - rhd (ji,jj,1) ) & & -0.5_wp * ( rhd(ji,jj,2) - rhd(ji,jj,1) ) &
& * ( ssh (ji,jj,Kmm) + gde3w(ji,jj,1) ) & & * gdept(ji,jj,1,Kmm) / e3w(ji,jj,2,Kmm) &
& / ( - gde3w(ji,jj,2) + gde3w(ji,jj,1) ) ) & )
END_2D END_2D
!-------------------------------------------------------------- !--------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment