Changeset 15551 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/OCE/SBC/sbc_phy.F90

Timestamp:

2021-11-28T21:19:36+01:00 (3 years ago)

Author:

gsamson

Message:

last changes on branch; ticket #2632

File:

• NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/OCE/SBC/sbc_phy.F90 (modified) (3 diffs)

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/OCE/SBC/sbc_phy.F90

@@ -257 +257 @@
         zmask = 1._wp
         ztpot = ptpot
+        zta   = 0._wp
       ELSE
         zmask = 0._wp 
+        ztpot = 0._wp
         zta   = pta
       ENDIF
@@ -585 +587 @@
       REAL(wp) :: ztptv
       !!-------------------------------------------------------------------
-      IF( PRESENT(pta_layer) .AND. PRESENT(pqa_layer) ) l_ptqa_l_prvd=.TRUE.
+      IF( PRESENT(pta_layer) .AND. PRESENT(pqa_layer) ) l_ptqa_l_prvd = .TRUE.
       !
       zsstv = virt_temp_sclr( psst, pssq )   ! virtual potential SST
@@ -610 +612 @@
       INTEGER  ::   ji, jj
 
-      IF( PRESENT(pta_layer) .AND. PRESENT(pqa_layer) ) l_ptqa_l_prvd=.TRUE.
-      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
-         IF( l_ptqa_l_prvd ) THEN  !!GS: "IF" inside loop needs to be removed
+      IF( PRESENT(pta_layer) .AND. PRESENT(pqa_layer) ) l_ptqa_l_prvd = .TRUE.
+      IF( l_ptqa_l_prvd ) THEN
+         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
             Ri_bulk_vctr(ji,jj) = Ri_bulk_sclr( pz, psst(ji,jj), ptha(ji,jj), pssq(ji,jj), pqa(ji,jj), pub(ji,jj), &
                &                                pta_layer=pta_layer(ji,jj ),  pqa_layer=pqa_layer(ji,jj ) )
-         ELSE
+         END_2D
+      ELSE
+         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
             Ri_bulk_vctr(ji,jj) = Ri_bulk_sclr( pz, psst(ji,jj), ptha(ji,jj), pssq(ji,jj), pqa(ji,jj), pub(ji,jj) )
-         END IF
-      END_2D
+         END_2D
+      END IF
 
    END FUNCTION Ri_bulk_vctr