Changeset 359 for trunk/NEMO/OPA_SRC/restart.F90

Timestamp:

2005-12-21T11:46:45+01:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_033 : RB + CT : Add new surface pressure gradient algorithms

File:

• trunk/NEMO/OPA_SRC/restart.F90 (modified) (10 diffs)

trunk/NEMO/OPA_SRC/restart.F90

@@ -21 +21 @@
    USE blk_oce         ! bulk variables
    USE flx_oce         ! sea-ice/ocean forcings variables
-
-   USE dynspg_fsc,      ONLY : lk_dynspg_fsc       ! ( mpp version )
-   USE dynspg_fsc_atsk, ONLY : lk_dynspg_fsc_tsk   ! 
+   USE dynspg          ! choice/control of key cpp for surface pressure gradient
+   USE dynspg_ts       ! free surface time splitting scheme variables
    USE cpl_oce,         ONLY : lk_cpl              !
 
@@ -37 +36 @@
       crestart = 'initial.nc'   ! restart file name
    !!----------------------------------------------------------------------
+   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! $Header$ 
+   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
+   !!----------------------------------------------------------------------
+
 
 CONTAINS
@@ -69 +73 @@
       !!        !  99-11  (M. Imbard)  Original code
       !!   8.5  !  02-08  (G. Madec)  F90: Free form
+      !!   9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
       !! * Modules used
@@ -84 +89 @@
       REAL(wp), DIMENSION(10) ::   zinfo(10)
       REAL(wp), DIMENSION(jpi,jpj) :: ztab 
-      !!----------------------------------------------------------------------
-      !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-      !! $Header$ 
-      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
       !!----------------------------------------------------------------------
 
@@ -164 +165 @@
          ztab(:,:) = gcxb(1:jpi,1:jpj)
          CALL restput( numwrs, 'gcxb'   , jpi, jpj, 1  , 0, ztab    )
-# if defined key_dynspg_fsc
-         CALL restput( numwrs, 'sshb'   , jpi, jpj, 1  , 0, sshb    )   ! free surface formulation (ssh)
-         CALL restput( numwrs, 'sshn'   , jpi, jpj, 1  , 0, sshn    )
-# else
+# if defined key_dynspg_rl
          CALL restput( numwrs, 'bsfb'   , jpi, jpj, 1  , 0, bsfb    )   ! Rigid-lid formulation (bsf)
          CALL restput( numwrs, 'bsfn'   , jpi, jpj, 1  , 0, bsfn    )
          CALL restput( numwrs, 'bsfd'   , jpi, jpj, 1  , 0, bsfd    )
+# else
+         CALL restput( numwrs, 'sshb'   , jpi, jpj, 1  , 0, sshb    )   ! free surface formulation (ssh)
+         CALL restput( numwrs, 'sshn'   , jpi, jpj, 1  , 0, sshn    )
+#  if defined key_dynspg_ts
+         CALL restput( numwrs, 'sshb_b' , jpi, jpj, 1  , 0, sshb_b  )   ! free surface formulation (ssh)
+         CALL restput( numwrs, 'sshn_b' , jpi, jpj, 1  , 0, sshn_b  )   ! issued from barotropic loop
+         CALL restput( numwrs, 'un_b'   , jpi, jpj, 1  , 0, un_b    )   ! horizontal transports
+         CALL restput( numwrs, 'vn_b'   , jpi, jpj, 1  , 0, vn_b    )   ! issued from barotropic loop
+#  endif
 # endif
 # if defined key_zdftke   ||   defined key_esopa
@@ -212 +219 @@
       !!      - prognostic variables on the second record
       !!      - elliptic solver arrays 
-      !!      - barotropic stream function arrays (default option)
-      !!        or free surface arrays ("key_dynspg_fsc" defined)
+      !!      - barotropic stream function arrays ("key_dynspg_rl" defined)
+      !!        or free surface arrays 
       !!      - tke arrays (lk_zdftke=T)
       !!      for this last three records,  the previous characteristics 
@@ -233 +240 @@
       !!        !  99-05  (M. Imbard)  Original code
       !!   8.5  !  02-09  (G. Madec)  F90: Free form
+      !!   9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
       !! * Modules used
@@ -239 +247 @@
       !! * Local declarations
       LOGICAL ::   llog
-      CHARACTER (len=8 ) ::   clvnames(30)
+      CHARACTER (len=8 ) ::   clvnames(50)
       CHARACTER (len=32) ::   clname = 'restart'
       INTEGER  ::   &
@@ -354 +362 @@
       CALL restget( inum, 'gcx'    , jpi, jpj, 1  , 0, llog, ztab    )
       gcx(1:jpi,1:jpj) = ztab(:,:) 
-# if defined key_dynspg_fsc
-      CALL restget( inum, 'sshb'   , jpi, jpj, 1  , 0, llog, sshb    )   ! free surface formulation (ssh)
-      CALL restget( inum, 'sshn'   , jpi, jpj, 1  , 0, llog, sshn    )
-# else
+# if defined key_dynspg_rl
       CALL restget( inum, 'bsfb'   , jpi, jpj, 1  , 0, llog, bsfb    )   ! Rigid-lid formulation (bsf)
       CALL restget( inum, 'bsfn'   , jpi, jpj, 1  , 0, llog, bsfn    )
       CALL restget( inum, 'bsfd'   , jpi, jpj, 1  , 0, llog, bsfd    )
+# else
+      CALL restget( inum, 'sshb'   , jpi, jpj, 1  , 0, llog, sshb    )   ! free surface formulation (ssh)
+      CALL restget( inum, 'sshn'   , jpi, jpj, 1  , 0, llog, sshn    )
+#  if defined key_dynspg_ts
+      CALL restget( inum, 'sshb_b' , jpi, jpj, 1  , 0, llog, sshb_b  )   ! free surface formulation (ssh)
+      CALL restget( inum, 'sshn_b' , jpi, jpj, 1  , 0, llog, sshn_b  )   ! issued from barotropic loop
+      CALL restget( inum, 'un_b'   , jpi, jpj, 1  , 0, llog, un_b    )   ! horizontal transports
+      CALL restget( inum, 'vn_b'   , jpi, jpj, 1  , 0, llog, vn_b    )   ! issued from barotropic loop
+#  endif
 # endif
 # if defined key_zdftke   ||   defined key_esopa
@@ -436 +450 @@
       rotb(:,:,:)=rotn(:,:,:)
       hdivb(:,:,:)=hdivn(:,:,:)
-#if defined key_dynspg_fsc
+#if defined key_dynspg_rl
+    ! rigid lid
+      bsfb(:,:)=bsfn(:,:)
+#else
     ! free surface formulation (eta)
       sshb(:,:)=sshn(:,:)
-#else
-    ! rigid lid
-      bsfb(:,:)=bsfn(:,:)
 #endif
     ENDIF