Changeset 4370 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

Timestamp:

2014-01-23T18:13:16+01:00 (10 years ago)

Author:

jchanut

Message:

Time split cleaning / AMM12 restart / BDY and Agrif. See tickets #1228, #1227, #1225 and #1133

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90 (modified) (5 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

@@ -40 +40 @@
    USE domvvl          ! varying vertical mesh
    USE dynspg_oce      ! pressure gradient schemes
-   USE dynspg_flt      ! pressure gradient schemes
-   USE dynspg_exp      ! pressure gradient schemes
-   USE dynspg_ts       ! pressure gradient schemes
+   USE dynspg_flt      ! filtered free surface
    USE sol_oce         ! ocean solver variables
    USE lib_mpp         ! MPP library
@@ -72 +70 @@
       ! - ML - needed for initialization of e3t_b
       INTEGER  ::  ji,jj,jk     ! dummy loop indices
-      REAL(wp), POINTER, DIMENSION(:,:) ::  zhur_b, zhvr_b ! U & Inverse of before depths
       REAL(wp), POINTER, DIMENSION(:,:,:,:)  ::  zuvd    ! U & V data workspace
       !!----------------------------------------------------------------------
@@ -93 +90 @@
       IF( ln_rstart ) THEN                    ! Restart from a file
          !                                    ! -------------------
-         neuler = 1                              ! Set time-step indicator at nit000 (leap-frog)
          CALL rst_read                           ! Read the restart file
          CALL day_init                           ! model calendar (using both namelist and restart infos)
@@ -161 +157 @@
       ! being eventually used
       !
-      IF (lk_vvl) THEN 
-         CALL wrk_alloc( jpi, jpj, zhur_b, zhvr_b  )
-         zhur_b(:,:) = 0._wp
-         zhvr_b(:,:) = 0._wp
-         DO jk = 1, jpk
-            zhur_b(:,:) = zhur_b(:,:) + fse3u_b(:,:,jk) * umask(:,:,jk)
-            zhvr_b(:,:) = zhvr_b(:,:) + fse3v_b(:,:,jk) * vmask(:,:,jk)
-         END DO
-         zhur_b(:,:) = umask(:,:,1) / ( zhur_b(:,:) + 1._wp - umask(:,:,1) )
-         zhvr_b(:,:) = vmask(:,:,1) / ( zhvr_b(:,:) + 1._wp - vmask(:,:,1) )
-      ENDIF
       !
       un_b(:,:) = 0._wp ; vn_b(:,:) = 0._wp
@@ -187 +172 @@
                vn_b(ji,jj) = vn_b(ji,jj) + fse3v_n(ji,jj,jk) * vn(ji,jj,jk) * vmask(ji,jj,jk)
                !
-               ub_b(ji,jj) = ub_b(ji,jj) + fse3u_b(ji,jj,jk) * ub(ji,jj,jk)  * umask(ji,jj,jk)
-               vb_b(ji,jj) = vb_b(ji,jj) + fse3v_b(ji,jj,jk) * vb(ji,jj,jk)  * vmask(ji,jj,jk)
+               ub_b(ji,jj) = ub_b(ji,jj) + fse3u_b(ji,jj,jk) * ub(ji,jj,jk) * umask(ji,jj,jk)
+               vb_b(ji,jj) = vb_b(ji,jj) + fse3v_b(ji,jj,jk) * vb(ji,jj,jk) * vmask(ji,jj,jk)
             END DO
          END DO
       END DO
       !
-      un_b(:,:) = un_b(:,:) * hur(:,:)
-      vn_b(:,:) = vn_b(:,:) * hvr(:,:)
-      !
-      IF( lk_vvl ) THEN
-         ub_b(:,:) = ub_b(:,:) * zhur_b(:,:)
-         vb_b(:,:) = vb_b(:,:) * zhvr_b(:,:)
-      ELSE
-         ub_b(:,:) = ub_b(:,:) * hur(:,:)
-         vb_b(:,:) = vb_b(:,:) * hvr(:,:)
-      ENDIF
-      !
-      IF (lk_vvl) CALL wrk_dealloc( jpi, jpj, zhur_b, zhvr_b  ) 
+      un_b(:,:) = un_b(:,:) * hur  (:,:)
+      vn_b(:,:) = vn_b(:,:) * hvr  (:,:)
+      !
+      ub_b(:,:) = ub_b(:,:) * hur_b(:,:)
+      vb_b(:,:) = vb_b(:,:) * hvr_b(:,:)
+      !
       !
       IF( nn_timing == 1 )  CALL timing_stop('istate_init')