Changeset 15127 for NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/OCE/ISF/isfcpl.F90

Timestamp:

2021-07-16T20:00:12+02:00 (3 years ago)

Author:

cetlod

Message:

dev_PISCO : merge with trunk@15119

Location:

NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO

Files:

• . (modified) (1 prop)
• src/OCE/ISF/isfcpl.F90 (modified) (8 diffs)

NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/dev_r14383_PISCES_NEWDEV_PISCO/src/OCE/ISF/isfcpl.F90

@@ -201 +201 @@
             ENDIF
          END_2D
+         CALL lbc_lnk( 'isfcpl', ssh(:,:,Kmm), 'T', 1.0_wp, zssmask_b(:,:), 'T', 1.0_wp )
          !
          zssh(:,:) = ssh(:,:,Kmm)
          zssmask0(:,:) = zssmask_b(:,:)
          !
-         CALL lbc_lnk( 'iscplrst', zssh, 'T', 1.0_wp, zssmask0, 'T', 1.0_wp )
          !
       END DO
@@ -359 +359 @@
          END DO
          !
+         CALL lbc_lnk( 'isfcpl', ts(:,:,:,jp_tem,Kmm), 'T', 1.0_wp, ts(:,:,:,jp_sal,Kmm), 'T', 1.0_wp, ztmask1, 'T', 1.0_wp)
+         !
          ! update temperature and salinity and mask
          zts0(:,:,:,:)  = ts(:,:,:,:,Kmm)
          ztmask0(:,:,:) = ztmask1(:,:,:)
          !
-         CALL lbc_lnk( 'iscplrst', zts0(:,:,:,jp_tem), 'T', 1.0_wp, zts0(:,:,:,jp_sal), 'T', 1.0_wp, ztmask0, 'T', 1.0_wp)
          !
       END DO  ! nn_drown
@@ -374 +375 @@
       ! -----------------------------------------------------------------------------------------
       ! case we open a cell but no neigbour cells available to get an estimate of T and S
-      DO_3D( 1, 1, 1, 1, 1,jpk-1 )
+      DO_3D( 0, 0, 0, 0, 1,jpk-1 )
          IF (tmask(ji,jj,jk) == 1._wp .AND. ts(ji,jj,jk,2,Kmm) == 0._wp)              &
             &   CALL ctl_stop('STOP', 'failing to fill all new weet cell,     &
@@ -437 +438 @@
                &    - e1v(ji  ,jj-1) * e3v(ji  ,jj-1,jk,Kmm) * vv(ji  ,jj-1,jk,Kmm)  ) &
                &               * tmask(ji,jj,jk)
+            !
+            ! 1.3: get 3d volume flux difference (before - after cpl) (>0 out)
+            !      correction to add is _b - _n
+            risfcpl_vol(ji,jj,jk) = zqvolb(ji,jj,jk) - zqvoln(ji,jj,jk)
          END_2D
-         !
-         ! 1.3: get 3d volume flux difference (before - after cpl) (>0 out)
-         !      correction to add is _b - _n
-         risfcpl_vol(:,:,jk) = zqvolb(:,:,jk) - zqvoln(:,:,jk)
       END DO
       !
@@ -455 +456 @@
       END_2D
       !
-      CALL lbc_lnk( 'iscpl', risfcpl_vol, 'T', 1.0_wp )
+      CALL lbc_lnk( 'isfcpl', risfcpl_vol, 'T', 1.0_wp )
       !
       ! 3.0: set total correction (div, tr(:,:,:,:,Krhs), ssh)
@@ -546 +547 @@
 
                ! volume diff
-               zdvol =   e3t  (ji,jj,jk,Kmm) *  tmask  (ji,jj,jk)   &
+               zdvol =   e3t(ji,jj,jk,Kmm) *  tmask  (ji,jj,jk)   &
                   &   - ze3t_b(ji,jj,jk    ) * ztmask_b(ji,jj,jk)
 
@@ -685 +686 @@
       !==============================================================================
       !
-      ! mask (>0 out)
+      ! mask
       risfcpl_cons_vol(:,:,:       ) = risfcpl_cons_vol(:,:,:       ) * tmask(:,:,:)
       risfcpl_cons_tsc(:,:,:,jp_sal) = risfcpl_cons_tsc(:,:,:,jp_sal) * tmask(:,:,:)
@@ -691 +692 @@
       !
       ! add lbclnk
-      CALL lbc_lnk( 'iscplrst', risfcpl_cons_tsc(:,:,:,jp_tem), 'T', 1.0_wp, risfcpl_cons_tsc(:,:,:,jp_sal), 'T', 1.0_wp, &
-         &                      risfcpl_cons_vol(:,:,:)       , 'T', 1.0_wp)
+      CALL lbc_lnk( 'isfcpl', risfcpl_cons_tsc(:,:,:,jp_tem), 'T', 1.0_wp, risfcpl_cons_tsc(:,:,:,jp_sal), 'T', 1.0_wp, &
+         &                    risfcpl_cons_vol(:,:,:)       , 'T', 1.0_wp)
       !
       ! ssh correction (for dynspg_ts)

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+