Changeset 10009 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/SBC/sbcice_cice.F90

Timestamp:

2018-07-29T11:23:51+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step II.1 time-level dimension on ssh

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/SBC/sbcice_cice.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/SBC/sbcice_cice.F90

@@ -227 +227 @@
       IF( .NOT.ln_rstart ) THEN
          IF( ln_ice_embd ) THEN            ! embedded sea-ice: deplete the initial ssh below sea-ice area
-            sshn(:,:) = sshn(:,:) - snwice_mass(:,:) * r1_rho0
-            sshb(:,:) = sshb(:,:) - snwice_mass(:,:) * r1_rho0
-
-!!gm This should be put elsewhere....   (same remark for limsbc)
-!!gm especially here it is assumed zstar coordinate, but it can be ztilde....
-            IF( .NOT.ln_linssh ) THEN
+            ssh(:,:,Nnn) = ssh(:,:,Nnn) - snwice_mass(:,:) * r1_rho0
+            ssh(:,:,Nbb) = ssh(:,:,Nbb) - snwice_mass(:,:) * r1_rho0
+            !
+            IF( .NOT.ln_linssh ) THEN     ! modified the now and before vertical mesh and scale factors 
                !
-               DO jk = 1,jpkm1                     ! adjust initial vertical scale factors
-                  e3t_n(:,:,jk) = e3t_0(:,:,jk) * ( 1._wp + sshn(:,:) * r1_ht_0(:,:) )
-                  e3t_b(:,:,jk) = e3t_0(:,:,jk) * ( 1._wp + sshb(:,:) * r1_ht_0(:,:) )
-               END DO
-               e3t_a(:,:,:) = e3t_b(:,:,:)
-               ! Reconstruction of all vertical scale factors at now and before time-steps
-               ! =============================================================================
-               ! Horizontal scale factor interpolations
-               ! --------------------------------------
-               CALL dom_vvl_interpol( e3t_b(:,:,:), e3u_b(:,:,:), 'U' )
-               CALL dom_vvl_interpol( e3t_b(:,:,:), e3v_b(:,:,:), 'V' )
-               CALL dom_vvl_interpol( e3t_n(:,:,:), e3u_n(:,:,:), 'U' )
-               CALL dom_vvl_interpol( e3t_n(:,:,:), e3v_n(:,:,:), 'V' )
-               CALL dom_vvl_interpol( e3u_n(:,:,:), e3f_n(:,:,:), 'F' )
-               ! Vertical scale factor interpolations
-               ! ------------------------------------
-               CALL dom_vvl_interpol( e3t_n(:,:,:), e3w_n (:,:,:), 'W'  )
-               CALL dom_vvl_interpol( e3u_n(:,:,:), e3uw_n(:,:,:), 'UW' )
-               CALL dom_vvl_interpol( e3v_n(:,:,:), e3vw_n(:,:,:), 'VW' )
-               CALL dom_vvl_interpol( e3u_b(:,:,:), e3uw_b(:,:,:), 'UW' )
-               CALL dom_vvl_interpol( e3v_b(:,:,:), e3vw_b(:,:,:), 'VW' )
-               ! t- and w- points depth
-               ! ----------------------
-               gdept_n(:,:,1) = 0.5_wp * e3w_n(:,:,1)
-               gdepw_n(:,:,1) = 0.0_wp
-               gde3w_n(:,:,1) = gdept_n(:,:,1) - sshn(:,:)
-               DO jk = 2, jpk
-                  gdept_n(:,:,jk) = gdept_n(:,:,jk-1) + e3w_n(:,:,jk)
-                  gdepw_n(:,:,jk) = gdepw_n(:,:,jk-1) + e3t_n(:,:,jk-1)
-                  gde3w_n(:,:,jk) = gdept_n(:,:,jk  ) - sshn   (:,:)
-               END DO
+               !                             !* BEFORE fields : 
+               CALL ssh2e3_before               ! set:      hu , hv , r1_hu, r1_hv 
+               !                                    !  e3t, e3w, e3u, e3uw, e3v, e3vw
+               !
+               !                             !* NOW fields : 
+               CALL ssh2e3_now                  ! set: ht , hu , hv , r1_hu, r1_hv
+               !                                !      e3t, e3w, e3u, e3uw, e3v, e3vw, e3f
+               !                                !      gdept_n, gdepw_n, gde3w_n
             ENDIF
          ENDIF
@@ -290 +265 @@
       ENDIF
 
-      ztmp(:,:)=0.0
+      ztmp(:,:) = 0._wp
 
 ! Aggregate ice concentration already set in cice_sbc_out (or cice_sbc_init on