Changeset 12150 for NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcssm.F90

Timestamp:

2019-12-10T15:16:33+01:00 (4 years ago)

Author:

davestorkey

Message:

2019/dev_r11943_MERGE_2019: Merge in UKMO_MERGE_2019.

File:

• NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcssm.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcssm.F90

@@ -61 +61 @@
       !
       !                                        !* surface T-, U-, V- ocean level variables (T, S, depth, velocity)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            zts(ji,jj,jp_tem) = ts(ji,jj,mikt(ji,jj),jp_tem,Kmm)
-            zts(ji,jj,jp_sal) = ts(ji,jj,mikt(ji,jj),jp_sal,Kmm)
-         END DO
-      END DO
+      zts(:,:,jp_tem) = ts(:,:,1,jp_tem,Kmm)
+      zts(:,:,jp_sal) = ts(:,:,1,jp_sal,Kmm)
       !
       IF( nn_fsbc == 1 ) THEN                             !   Instantaneous surface fields        !
@@ -73 +69 @@
          ssv_m(:,:) = vv(:,:,1,Kbb)
          IF( l_useCT )  THEN    ;   sst_m(:,:) = eos_pt_from_ct( zts(:,:,jp_tem), zts(:,:,jp_sal) )
-         ELSE                    ;   sst_m(:,:) = zts(:,:,jp_tem)
+         ELSE                   ;   sst_m(:,:) = zts(:,:,jp_tem)
          ENDIF
          sss_m(:,:) = zts(:,:,jp_sal)