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

Timestamp:

2007-06-29T18:37:27+02:00 (17 years ago)

Author:

rblod

Message:

nemo_v2_update_021 : SM : use jpdom_autoglo in restarts

File:

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

trunk/NEMO/OPA_SRC/restart.F90

@@ -43 +43 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $Header$ 
+   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/restart.F90,v 1.27 2007/06/05 10:35:19 opalod Exp $ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -276 +276 @@
       !
       !                                                       ! Read prognostic variables
-      CALL iom_get( numror, jpdom_local, 'ub'   , ub    )        ! before i-component velocity
-      CALL iom_get( numror, jpdom_local, 'vb'   , vb    )        ! before j-component velocity
-      CALL iom_get( numror, jpdom_local, 'tb'   , tb    )        ! before temperature
-      CALL iom_get( numror, jpdom_local, 'sb'   , sb    )        ! before salinity
-      CALL iom_get( numror, jpdom_local, 'rotb' , rotb  )        ! before curl
-      CALL iom_get( numror, jpdom_local, 'hdivb', hdivb )        ! before horizontal divergence
-      CALL iom_get( numror, jpdom_local, 'un'   , un    )        ! now    i-component velocity
-      CALL iom_get( numror, jpdom_local, 'vn'   , vn    )        ! now    j-component velocity
-      IF( lk_vvl ) CALL iom_get( numror, jpdom_local, 'wn'   , wn    )        ! now    k-component velocity
-      CALL iom_get( numror, jpdom_local, 'tn'   , tn    )        ! now    temperature
-      CALL iom_get( numror, jpdom_local, 'sn'   , sn    )        ! now    salinity
-      CALL iom_get( numror, jpdom_local, 'rotn' , rotn  )        ! now    curl
-      CALL iom_get( numror, jpdom_local, 'hdivn', hdivn )        ! now    horizontal divergence
+      CALL iom_get( numror, jpdom_autoglo, 'ub'   , ub    )        ! before i-component velocity
+      CALL iom_get( numror, jpdom_autoglo, 'vb'   , vb    )        ! before j-component velocity
+      CALL iom_get( numror, jpdom_autoglo, 'tb'   , tb    )        ! before temperature
+      CALL iom_get( numror, jpdom_autoglo, 'sb'   , sb    )        ! before salinity
+      CALL iom_get( numror, jpdom_autoglo, 'rotb' , rotb  )        ! before curl
+      CALL iom_get( numror, jpdom_autoglo, 'hdivb', hdivb )        ! before horizontal divergence
+      CALL iom_get( numror, jpdom_autoglo, 'un'   , un    )        ! now    i-component velocity
+      CALL iom_get( numror, jpdom_autoglo, 'vn'   , vn    )        ! now    j-component velocity
+      IF( lk_vvl ) CALL iom_get( numror, jpdom_autoglo, 'wn'   , wn    )        ! now    k-component velocity
+      CALL iom_get( numror, jpdom_autoglo, 'tn'   , tn    )        ! now    temperature
+      CALL iom_get( numror, jpdom_autoglo, 'sn'   , sn    )        ! now    salinity
+      CALL iom_get( numror, jpdom_autoglo, 'rotn' , rotn  )        ! now    curl
+      CALL iom_get( numror, jpdom_autoglo, 'hdivn', hdivn )        ! now    horizontal divergence
 
 
@@ -306 +306 @@
       IF( iom_varid( numror, 'nfice' ) > 0 ) then 
          CALL iom_get( numror             , 'nfice'  , znfice  )   ! ice computation frequency
-         CALL iom_get( numror, jpdom_local, 'sst_io' , sst_io  )
-         CALL iom_get( numror, jpdom_local, 'sss_io' , sss_io  )
-         CALL iom_get( numror, jpdom_local, 'u_io'   , u_io    )
-         CALL iom_get( numror, jpdom_local, 'v_io'   , v_io    )
+         CALL iom_get( numror, jpdom_autoglo, 'sst_io' , sst_io  )
+         CALL iom_get( numror, jpdom_autoglo, 'sss_io' , sss_io  )
+         CALL iom_get( numror, jpdom_autoglo, 'u_io'   , u_io    )
+         CALL iom_get( numror, jpdom_autoglo, 'v_io'   , v_io    )
 # if defined key_coupled
-         CALL iom_get( numror, jpdom_local, 'alb_ice', alb_ice )
+         CALL iom_get( numror, jpdom_autoglo, 'alb_ice', alb_ice )
 # endif
          IF( znfice /= REAL( nfice, wp ) ) THEN      ! if nfice changed between 2 runs
@@ -343 +343 @@
       IF( iom_varid( numror, 'nfbulk' ) > 0 ) THEN 
          CALL iom_get( numror             , 'nfbulk', znfbulk )   ! bulk computation frequency
-         CALL iom_get( numror, jpdom_local, 'gsst'  , gsst    )
+         CALL iom_get( numror, jpdom_autoglo, 'gsst'  , gsst    )
          IF( znfbulk /= REAL(nfbulk, wp) ) THEN      ! if you change nfbulk between 2 runs
             zcoef = REAL( nfbulk-1, wp ) / znfbulk
@@ -359 +359 @@
 
       IF( iom_varid( numror, 'rhd' ) > 0 ) THEN
-         CALL iom_get( numror, jpdom_local, 'rhd' , rhd  )
-         CALL iom_get( numror, jpdom_local, 'rhop', rhop )
+         CALL iom_get( numror, jpdom_autoglo, 'rhd' , rhd  )
+         CALL iom_get( numror, jpdom_autoglo, 'rhop', rhop )
       ELSE
          CALL eos( tb, sb, rhd, rhop )        ! before potential and in situ densities
@@ -366 +366 @@
       IF( ln_zps .AND. .NOT. lk_cfg_1d ) THEN
          IF( iom_varid( numror, 'gtu' ) > 0 ) THEN
-            CALL iom_get( numror, jpdom_local, 'gtu' , gtu )
-            CALL iom_get( numror, jpdom_local, 'gsu' , gsu )
-            CALL iom_get( numror, jpdom_local, 'gru' , gru )
-            CALL iom_get( numror, jpdom_local, 'gtv' , gtv )
-            CALL iom_get( numror, jpdom_local, 'gsv' , gsv )
-            CALL iom_get( numror, jpdom_local, 'grv' , grv )
+            CALL iom_get( numror, jpdom_autoglo, 'gtu' , gtu )
+            CALL iom_get( numror, jpdom_autoglo, 'gsu' , gsu )
+            CALL iom_get( numror, jpdom_autoglo, 'gru' , gru )
+            CALL iom_get( numror, jpdom_autoglo, 'gtv' , gtv )
+            CALL iom_get( numror, jpdom_autoglo, 'gsv' , gsv )
+            CALL iom_get( numror, jpdom_autoglo, 'grv' , grv )
          ELSE
             CALL zps_hde( nit000, tb , sb , rhd,   &  ! Partial steps: before Horizontal DErivative