Changeset 1438 for trunk/NEMO/OPA_SRC/istate.F90

Timestamp:

2009-05-11T16:34:47+02:00 (15 years ago)

Author:

rblod

Message:

Merge VVL branch with the trunk (act II), see ticket #429

File:

• trunk/NEMO/OPA_SRC/istate.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/istate.F90

@@ -132 +132 @@
          
       ENDIF
-
-      IF( lk_vvl .OR. lk_agrif ) THEN
+      !
+      IF( lk_agrif ) THEN
          ! read free surface arrays in restart file
          IF( ln_rstart ) THEN
             IF( lk_dynspg_flt )   CALL flt_rst( nit000, 'READ' )      ! read or initialize the following fields
-            !                                                         ! gcx, gcxb, sshb, sshn
-            IF( lk_dynspg_ts  )   CALL ts_rst ( nit000, 'READ' )      ! read or initialize the following fields
-            !                                                         ! sshb, sshn, sshb_b, sshn_b, un_b, vn_b
-            IF( lk_dynspg_exp )   CALL exp_rst( nit000, 'READ' )      ! read or initialize the following fields
-            !                                                         ! sshb, sshn
-         ENDIF
+            !                                                         ! gcx, gcxb for agrif_opa_init
+         ENDIF                                                        ! explicit case not coded yet with AGRIF
       ENDIF
-
-      IF( lk_vvl ) THEN
-
-         !
-         IF( .NOT. lk_dynspg_flt ) sshbb(:,:) = sshb(:,:)
-         !
-         CALL dom_vvl               ! ssh init and vertical grid update
-
-         CALL eos_init              ! usefull to get the equation state type neos parameter
-
-         CALL bn2( tb, sb, rn2 )    ! before Brunt Vaissala frequency
-
-         IF( .NOT. ln_rstart ) CALL wzv( nit000 ) 
-
-      ENDIF
-
-      !                                       ! Vertical velocity
-      !                                       ! -----------------
-
-      IF( .NOT. lk_vvl )    CALL wzv( nit000 )                         ! from horizontal divergence
       !
    END SUBROUTINE istate_init