Changeset 1545

Timestamp:

2009-07-27T15:21:15+02:00 (15 years ago)

Author:

ctlod

Message:

ocean restart file update, see ticket: #494

File:

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

trunk/NEMO/OPA_SRC/restart.F90

@@ -130 +130 @@
       CALL iom_rstput( kt, nitrst, numrow, 'hdivn'  , hdivn   )
 
-      CALL iom_rstput( kt, nitrst, numrow, 'rhop'  , rhop   )
-
-#if defined key_zdfddm
-      IF( lk_zdfddm )   CALL iom_rstput( kt, nitrst, numrow, 'rrau' , rrau  )
+      CALL iom_rstput( kt, nitrst, numrow, 'rhop'   , rhop    )
+#if defined key_zdfkpp
+      CALL iom_rstput( kt, nitrst, numrow, 'rhd'  , rhd   )
 #endif
 
@@ -197 +196 @@
       CALL iom_get( numror, jpdom_autoglo, 'hdivn', hdivn )        ! now    horizontal divergence
 
-      CALL iom_get( numror, jpdom_autoglo, 'rhop', rhop )          ! now    mixed layer depth
-
-#if defined key_zdfddm
-      IF( lk_zdfddm ) THEN
-         IF( iom_varid( numror, 'rrau', ldstop = .FALSE. ) > 0 ) THEN
-            CALL iom_get( numror, jpdom_autoglo, 'rrau' , rrau  )
-         ELSE
-            CALL eos_init                   ! read equation state type neos parameter
-            CALL eos( tb, sb, rhd, rhop )   ! compute rrau
-         ENDIF
-      ENDIF 
+      CALL iom_get( numror, jpdom_autoglo, 'rhop' , rhop  )        ! now    potential density
+#if defined key_zdfkpp
+      IF( iom_varid( numror, 'rhd', ldstop = .FALSE. ) > 0 ) THEN
+         CALL iom_get( numror, jpdom_autoglo, 'rhd' , rhd  )       ! now    in situ density anomaly
+      ELSE
+         CALL eos( tn, sn, rhd )   ! compute rhd
+      ENDIF
 #endif