Changeset 1537 for trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90

Timestamp:

2009-07-24T16:22:23+02:00 (15 years ago)

Author:

ctlod

Message:

ensure the restartability of the 2nd order advection scheme,see ticket: 489

File:

• trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90

@@ -30 +30 @@
    USE sbcrnf          ! river runoffs
    USE in_out_manager  ! I/O manager
+   USE iom             ! IOM library
    USE lib_mpp
    USE lbclnk          ! ocean lateral boundary condition (or mpp link)
@@ -35 +36 @@
    USE prtctl          ! Print control
    USE zdf_oce         ! ocean vertical physics
+   USE restart         ! ocean restart
 
    IMPLICIT NONE
@@ -156 +158 @@
          !   
          btr2(:,:) = 1. / ( e1t(:,:) * e2t(:,:) )        ! inverse of T-point surface
-            IF ( jp_cfg == 2 ) THEN
-            !   Increase the background in the surface layers
-               avmb(1) = 10.  * avmb(1)      ;      avtb(1) = 10.  * avtb(1)
-               avmb(2) = 10.  * avmb(2)      ;      avtb(2) = 10.  * avtb(2)
-               avmb(3) =  5.  * avmb(3)      ;      avtb(3) =  5.  * avtb(3)
-               avmb(4) =  2.5 * avmb(4)      ;      avtb(4) =  2.5 * avtb(4)
-            ENDIF
+         !
+         IF( jp_cfg == 2 .AND. .NOT. ln_rstart ) THEN    ! Increase the background in the surface layers
+            avmb(1) = 10.  * avmb(1)      ;      avtb(1) = 10.  * avtb(1)
+            avmb(2) = 10.  * avmb(2)      ;      avtb(2) = 10.  * avtb(2)
+            avmb(3) =  5.  * avmb(3)      ;      avtb(3) =  5.  * avtb(3)
+            avmb(4) =  2.5 * avmb(4)      ;      avtb(4) =  2.5 * avtb(4)
+         ENDIF
       ENDIF
 
@@ -412 +414 @@
       ENDIF
 
+      ! write avmb, avtb in restart (traadv_cen2 requires a modified avmb, avtb that are
+      ! ---------------------------  required in restart file to ensure restartability)
+      ! avmb, avtb will be read in zdfini in restart case as they are used in zdftke, kpp etc...
+      IF( lrst_oce ) THEN
+         CALL iom_rstput( kt, nitrst, numrow, 'avmb', avmb )
+         CALL iom_rstput( kt, nitrst, numrow, 'avtb', avtb )
+      ENDIF
+
       IF(ln_ctl)   CALL prt_ctl( tab3d_1=ta, clinfo1=' cen2 zad  - Ta: ', mask1=tmask, &
          &                       tab3d_2=sa, clinfo2=            ' Sa: ', mask2=tmask, clinfo3='tra' )