Skip to content

adding check whether to use eosbn2_pol or eosbn2_80 to cdfbn2 #58

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

Open
jk-rieck wants to merge 2 commits into
base: master
Choose a base branch
from
Open

adding check whether to use eosbn2_pol or eosbn2_80 to cdfbn2 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5439190
adding check whether to use eosbn2_pol or eosbn2_80 to cdfbn2
Nov 8, 2023
f61fe00
fixed the same error regarding eosbn2 in cdfpvor
Nov 15, 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
6 changes: 5 additions & 1 deletion src/cdfbn2.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,11 @@ PROGRAM cdfbn2
ELSE ; e3w(:,:) = getvar(cn_fe3w, cn_ve3w , jk, npiglo, npjglo, ktime=it, ldiom=.NOT.lg_vvl )
ENDIF

zwk(:,:,iup) = eosbn2(ztemp, zsal, gdep(jk), e3w, npiglo, npjglo ,iup, idown )* zmask(:,:)
IF ( ll_teos10 ) THEN
zwk(:,:,iup) = eosbn2(ztemp, zsal, gdep(jk), e3w, npiglo, npjglo ,iup, idown )* zmask(:,:)
ELSE
zwk(:,:,iup) = eosbn2(ztemp, zsal, gdep(jk), e3w, npiglo, npjglo ,iup, idown, .TRUE. )* zmask(:,:)
ENDIF

IF ( .NOT. l_w ) THEN
! now put zn2 at T level (k )
Expand Down
6 changes: 5 additions & 1 deletion src/cdfpvor.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,11 @@ PROGRAM cdfpvor

WHERE (e3w == 0 ) e3w = 1.

zwk(:,:,iup) = eosbn2 ( ztemp, zsal, gdepw(jk), e3w, npiglo, npjglo ,iup, idown)* tmask(:,:)
IF ( ll_teos10 ) THEN
zwk(:,:,iup) = eosbn2(ztemp, zsal, gdepw(jk), e3w, npiglo, npjglo ,iup, idown)* tmask(:,:)
ELSE
zwk(:,:,iup) = eosbn2(ztemp, zsal, gdepw(jk), e3w, npiglo, npjglo ,iup, idown, .TRUE. )* tmask(:,:)
ENDIF
!
IF ( lertel ) THEN ! put zn2 at T level (k )
WHERE ( zwk(:,:,idown) == 0 )
Expand Down