Changeset 1433 for branches/dev_004_VVL

Timestamp:

2009-05-11T15:33:19+02:00 (15 years ago)

Author:

rblod

Message:

dev_004_VVL: ensure restartability, see ticket #401

Location:

branches/dev_004_VVL/NEMO/OPA_SRC

Files:

• restart.F90 (modified) (4 diffs)
• step.F90 (modified) (2 diffs)

branches/dev_004_VVL/NEMO/OPA_SRC/restart.F90

@@ -143 +143 @@
       CALL iom_rstput( kt, nitrst, numrow, 'rotn'   , rotn    )
       CALL iom_rstput( kt, nitrst, numrow, 'hdivn'  , hdivn   )
+      CALL iom_rstput( kt, nitrst, numrow, 'rn2' , rn2  )
 
 #if defined key_zdftke2
@@ -150 +151 @@
          CALL iom_rstput( kt, nitrst, numrow, 'rhd' , rhd  )
 #if defined key_zdftke2
-         CALL iom_rstput( kt, nitrst, numrow, 'rn2' , rn2  )
          CALL iom_rstput( kt, nitrst, numrow, 'avt' , avt  )
       ENDIF
@@ -239 +239 @@
          hdivb(:,:,:) = hdivn(:,:,:)
       ENDIF
+      CALL eos_init            ! usefull to get the equation state type neos parameter
+      IF( iom_varid( numror, 'rn2', ldstop = .FALSE. ) > 0 ) THEN
+         CALL iom_get( numror, jpdom_autoglo, 'rn2' , rn2  )
+      ELSE
+         CALL bn2( tb, sb, rn2 )  ! before Brunt-Vaisala frequency   
+      ENDIF
 
 #if defined key_zdftke2
@@ -257 +263 @@
 #endif
 #if defined key_zdftke2
-      CALL eos_init            ! usefull to get the equation state type neos parameter
-      IF( iom_varid( numror, 'rn2', ldstop = .FALSE. ) > 0 ) THEN
-         CALL iom_get( numror, jpdom_autoglo, 'rn2' , rn2  )
-      ELSE
-         IF ( ln_dynhpg_imp ) THEN
-            CALL bn2( tb, sb, rn2 )  ! before Brunt-Vaisala frequency   
-         ENDIF      
-      ENDIF
       IF( iom_varid( numror, 'avt', ldstop = .FALSE. ) > 0 ) THEN
          CALL iom_get( numror, jpdom_autoglo, 'avt' , avt  )

branches/dev_004_VVL/NEMO/OPA_SRC/step.F90

@@ -208 +208 @@
       ! N.B. ua, va, ta, sa arrays are used as workspace in this section
       !-----------------------------------------------------------------------
-#if defined key_zdftke2
-      IF ( ln_dynhpg_imp ) THEN
-      !-----------------------------------------------------------------------
-      !  LATERAL PHYSICS
-      !-----------------------------------------------------------------------
-                               CALL zdf_mxl( kstp )                 ! mixed layer depth
-         IF( lk_ldfslp     )   CALL ldf_slp( kstp, rhd, rn2 )       ! before slope of the lateral mixing
-#  if defined key_traldf_c2d
-         IF( lk_traldf_eiv )   CALL ldf_eiv( kstp )                 ! eddy induced velocity coefficient
-#  endif
-      ENDIF
-#endif
-      !-----------------------------------------------------------------------
-      !  VERTICAL PHYSICS
-      !-----------------------------------------------------------------------
       IF( neuler == 0 .AND. kstp == nit000 ) THEN
                         CALL bn2( tn, sn, rn2 )              ! now    Brunt-Vaisala frequency
@@ -231 +216 @@
       ENDIF
 
+#if defined key_zdftke2
+      IF ( ln_dynhpg_imp ) THEN
+      !-----------------------------------------------------------------------
+      !  LATERAL PHYSICS
+      !-----------------------------------------------------------------------
+                               CALL zdf_mxl( kstp )                 ! mixed layer depth
+         IF( lk_ldfslp     )   CALL ldf_slp( kstp, rhd, rn2b )      ! before slope of the lateral mixing
+#  if defined key_traldf_c2d
+         IF( lk_traldf_eiv )   CALL ldf_eiv( kstp )                 ! eddy induced velocity coefficient
+#  endif
+      ENDIF
+#endif
+      !-----------------------------------------------------------------------
+      !  VERTICAL PHYSICS
+      !-----------------------------------------------------------------------
       !                                                     ! Vertical eddy viscosity and diffusivity coefficients
       IF( lk_zdfric )   CALL zdf_ric( kstp )                       ! Richardson number dependent Kz