Skip to content
Snippets Groups Projects
Commit f1ef2720 authored by Daley Calvert's avatar Daley Calvert
Browse files

Merge branch...

Merge branch '340-coherent-north-pole-folding-of-velocity-assimilation-increments' into 'branch_4.2'

Resolve "Coherent north-pole folding of velocity assimilation increments"

See merge request nemo/nemo!415
parents d2cbb705 61681369
No related branches found
No related tags found
No related merge requests found
...@@ -372,8 +372,8 @@ CONTAINS ...@@ -372,8 +372,8 @@ CONTAINS
ENDIF ENDIF
IF ( ln_dyninc ) THEN IF ( ln_dyninc ) THEN
CALL iom_get( inum, jpdom_auto, 'bckinu', u_bkginc, 1 ) CALL iom_get( inum, jpdom_auto, 'bckinu', u_bkginc, 1, cd_type = 'U', psgn = -1._wp )
CALL iom_get( inum, jpdom_auto, 'bckinv', v_bkginc, 1 ) CALL iom_get( inum, jpdom_auto, 'bckinv', v_bkginc, 1, cd_type = 'V', psgn = -1._wp )
! Apply the masks ! Apply the masks
u_bkginc(:,:,:) = u_bkginc(:,:,:) * umask(:,:,:) u_bkginc(:,:,:) = u_bkginc(:,:,:) * umask(:,:,:)
v_bkginc(:,:,:) = v_bkginc(:,:,:) * vmask(:,:,:) v_bkginc(:,:,:) = v_bkginc(:,:,:) * vmask(:,:,:)
...@@ -474,8 +474,8 @@ CONTAINS ...@@ -474,8 +474,8 @@ CONTAINS
ENDIF ENDIF
! !
IF ( ln_dyninc ) THEN IF ( ln_dyninc ) THEN
CALL iom_get( inum, jpdom_auto, 'un', u_bkg, cd_type = 'U', psgn = 1._wp ) CALL iom_get( inum, jpdom_auto, 'un', u_bkg, cd_type = 'U', psgn = -1._wp )
CALL iom_get( inum, jpdom_auto, 'vn', v_bkg, cd_type = 'V', psgn = 1._wp ) CALL iom_get( inum, jpdom_auto, 'vn', v_bkg, cd_type = 'V', psgn = -1._wp )
u_bkg(:,:,:) = u_bkg(:,:,:) * umask(:,:,:) u_bkg(:,:,:) = u_bkg(:,:,:) * umask(:,:,:)
v_bkg(:,:,:) = v_bkg(:,:,:) * vmask(:,:,:) v_bkg(:,:,:) = v_bkg(:,:,:) * vmask(:,:,:)
ENDIF ENDIF
......
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