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

Timestamp:

2007-02-09T10:40:34+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_update_001 : CT : - add non linear free surface (variable volume) with new cpp key key_vvl

File:

• trunk/NEMO/OPA_SRC/istate.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/istate.F90

@@ -39 +39 @@
    USE zpshde          ! partial step: hor. derivative (zps_hde routine)
    USE eosbn2          ! equation of state            (eos bn2 routine)
+   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
    
    IMPLICIT NONE
@@ -83 +88 @@
          !                                       ! Initialization of ocean to zero
          !     before fields       !       now fields          
-         ;   ub   (:,:,:) = 0.e0   ;   un   (:,:,:) = 0.e0   
-         ;   vb   (:,:,:) = 0.e0   ;   vn   (:,:,:) = 0.e0    
-         ;   rotb (:,:,:) = 0.e0   ;   rotn (:,:,:) = 0.e0  
-         ;   hdivb(:,:,:) = 0.e0   ;   hdivn(:,:,:) = 0.e0  
+         ;   ub   (:,:,:) = 0.e0   ;   un   (:,:,:) = 0.e0   ; sshb(:,:) = 0.e0
+         ;   vb   (:,:,:) = 0.e0   ;   vn   (:,:,:) = 0.e0   ; sshn(:,:) = 0.e0
+         ;   rotb (:,:,:) = 0.e0   ;   rotn (:,:,:) = 0.e0
+         ;   hdivb(:,:,:) = 0.e0   ;   hdivn(:,:,:) = 0.e0
          !
          IF( cp_cfg == 'eel' ) THEN
@@ -126 +131 @@
       ENDIF
 
+      IF( lk_vvl ) 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
+         !
+         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
       !                                       ! -----------------
-      CALL wzv( nit000 )                         ! from horizontal divergence
+
+      IF( .NOT. lk_vvl )    CALL wzv( nit000 )                         ! from horizontal divergence
       !
    END SUBROUTINE istate_init
@@ -213 +241 @@
       INTEGER  ::   ijloc
       REAL(wp) ::   zh1, zh2, zslope, zcst, zfcor   ! temporary scalars
-      REAL(wp) ::   zt1  = 12._wp,               &  ! surface temperature value (EEL R5)
-         &          zt2  =  2._wp,               &  ! bottom  temperature value (EEL R5)
-         &          zsal = 35.5_wp,              &  ! constant salinity (EEL R2, R5 and R6)
+      REAL(wp) ::   zt1  = 15._wp,               &  ! surface temperature value (EEL R5)
+         &          zt2  =  5._wp,               &  ! bottom  temperature value (EEL R5)
+         &          zsal = 35.0_wp,              &  ! constant salinity (EEL R2, R5 and R6)
          &          zueel = 0.1_wp                  ! constant uniform zonal velocity (EEL R5)
 # if ! defined key_dynspg_rl
@@ -240 +268 @@
 
             DO jk = 1, jpk
-               tn(:,:,jk) = ( zslope * fsdept(:,:,jk) + zcst  ) * tmask(:,:,jk)
+               tn(:,:,jk) = ( zt2 + zt1 * exp( - fsdept(:,:,jk) / 1000 ) ) * tmask(:,:,jk)
                tb(:,:,jk) = tn(:,:,jk)
             END DO
@@ -291 +319 @@
             sshn(:,:) = sshb(:,:)                   ! set now ssh to the before value
 
-            IF( nn_rstssh /= 1 ) THEN  
-               nn_rstssh = 1                           ! hand-made initilization of ssh 
-               CALL ctl_warn( 'istate_eel: force nn_rstssh = 1' )
+            IF( nn_rstssh /= 0 ) THEN  
+               nn_rstssh = 0                           ! hand-made initilization of ssh 
+               CALL ctl_warn( 'istate_eel: force nn_rstssh = 0' )
             ENDIF