Changeset 5120 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90

Timestamp:

2015-03-03T17:11:55+01:00 (9 years ago)

Author:

acc

Message:

#1473. Re-organisation and optimisation of ice shelf cavity option. This commit merges changes from the dev_r5094_UKMO_ISFCLEAN branch onto the trunk. Results will change, even with ln_isfcav=F, due to a return to original definitions of the vertical metrics. All changes have been reviewed and SETTE tested.

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90

@@ -61 +61 @@
       !!---------------------------------------------------------------------
       
-      !                                        !* first wet T-, U-, V- ocean level (ISF) variables (T, S, depth, velocity)
+      !                                        !* surface T-, U-, V- ocean level variables (T, S, depth, velocity)
       DO jj = 1, jpj
          DO ji = 1, jpi
-            zub(ji,jj)        = ub (ji,jj,miku(ji,jj))
-            zvb(ji,jj)        = vb (ji,jj,mikv(ji,jj))
             zts(ji,jj,jp_tem) = tsn(ji,jj,mikt(ji,jj),jp_tem)
             zts(ji,jj,jp_sal) = tsn(ji,jj,mikt(ji,jj),jp_sal)
          END DO
       END DO
+      zub(:,:)        = ub (:,:,1       )
+      zvb(:,:)        = vb (:,:,1       )
       !
       IF( lk_vvl ) THEN
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               zdep(ji,jj) = fse3t_n(ji,jj,mikt(ji,jj))
-            END DO
-         END DO
+         zdep(:,:) = fse3t_n(:,:,1)
       ENDIF
       !                                                   ! ---------------------------------------- !