Changeset 10030 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OFF/dtadyn.F90

Timestamp:

2018-08-03T10:18:16+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step II.3 remove e3uw_$ e3vw_$, except e3.w_0 and use only after e3 in dyn/trazdf

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OFF/dtadyn.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OFF/dtadyn.F90

@@ -332 +332 @@
          !
          !                          !* BEFORE fields : 
-         CALL ssh2e3_before               ! set:      hu , hv , r1_hu, r1_hv 
-         !                                !      e3t, e3w, e3u, e3uw, e3v, e3vw        (from 1 to jpkm1)
+         CALL ssh2e3_before               ! set:       hu,  hv, r1_hu, r1_hv 
+         !                                !      e3t, e3u, e3v,            (from 1 to jpkm1)
+         !                                !      e3w,                      (from 1 to jpk  )
          !
          !                                ! set jpk level one to the e3._0 values
-         e3t_b(:,:,jpk) = e3t_0(:,:,jpk)  ;   e3u_b(:,:,jpk) =  e3w_0(:,:,jpk)  ;   e3v_b(:,:,jpk) =  e3v_0(:,:,jpk)
-         e3w_b(:,:,jpk) = e3w_0(:,:,jpk)  ;  e3uw_b(:,:,jpk) = e3uw_0(:,:,jpk)  ;  e3vw_b(:,:,jpk) = e3vw_0(:,:,jpk)
+         e3t_b(:,:,jpk) = e3t_0(:,:,jpk)  ;  e3u_b(:,:,jpk) = e3u_0(:,:,jpk)
+                                             e3v_b(:,:,jpk) = e3v_0(:,:,jpk)
          !
          !                          !* NOW fields : 
-         CALL ssh2e3_now                  ! set: ht , hu , hv , r1_hu, r1_hv
-         !                                !      e3t, e3w, e3u, e3uw, e3v, e3vw, e3f   (from 1 to jpkm1)
-         !                                !      gdept_n, gdepw_n, gde3w_n
-!!gm issue?   gdept_n, gdepw_n, gde3w_n never defined at jpk
+         CALL ssh2e3_now                  ! set:  ht,  hu,  hv, r1_hu, r1_hv
+         !                                !      e3t, e3u, e3v , e3f              (from 1 to jpkm1)
+         !                                !      e3w, gdept_n, gdepw_n, gde3w_n   (from 1 to jpk  )
          !
          !                                ! set one for all last level to the e3._0 value
-         e3t_n(:,:,jpk) = e3t_0(:,:,jpk)  ;   e3u_n(:,:,jpk) =  e3w_0(:,:,jpk)  ;   e3v_n(:,:,jpk) =  e3v_0(:,:,jpk)
-         e3w_n(:,:,jpk) = e3w_0(:,:,jpk)  ;  e3uw_n(:,:,jpk) = e3uw_0(:,:,jpk)  ;  e3vw_n(:,:,jpk) = e3vw_0(:,:,jpk)
-         e3f_n(:,:,jpk) = e3f_0(:,:,jpk)
+         e3t_n(:,:,jpk) = e3t_0(:,:,jpk)  ;  e3u_n(:,:,jpk) = e3u_0(:,:,jpk)
+         e3f_n(:,:,jpk) = e3f_0(:,:,jpk)  ;  e3v_n(:,:,jpk) = e3v_0(:,:,jpk)
          !
          !                          !* AFTER fields : (last level for OPA, 3D required for AGRIF initialisation)
-         e3t_a(:,:,:) = e3t_n(:,:,:)   ;   e3u_a(:,:,:) = e3u_n(:,:,:)   ;   e3v_a(:,:,:) = e3v_n(:,:,:)
+         e3t_a(:,:,:) = e3t_n(:,:,:)   ;   e3u_a(:,:,:) = e3u_n(:,:,:)
+         e3w_a(:,:,:) = e3w_n(:,:,:)   ;   e3v_a(:,:,:) = e3v_n(:,:,:)
          !
       ENDIF
@@ -370 +370 @@
                   END DO
                   nk_rnf(ji,jj) = jk
-               ELSEIF( h_rnf(ji,jj) == -1._wp   ) THEN   ;  nk_rnf(ji,jj) = 1
-               ELSEIF( h_rnf(ji,jj) == -999._wp ) THEN   ;  nk_rnf(ji,jj) = mbkt(ji,jj)
+               ELSEIF( h_rnf(ji,jj) == -1._wp   ) THEN   ;   nk_rnf(ji,jj) = 1
+               ELSEIF( h_rnf(ji,jj) == -999._wp ) THEN   ;   nk_rnf(ji,jj) = mbkt(ji,jj)
                ELSE
                   CALL ctl_stop( 'sbc_rnf_init: runoff depth not positive, and not -999 or -1, rnf value in file fort.999'  )