Changeset 4572

Timestamp:

2014-03-26T09:18:40+01:00 (10 years ago)

Author:

pabouttier

Message:

Add missing div_cur_adj/tan in istate_tam module ; remove call to day_init in istate_tan, see Ticket #1269

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/DOM/istate_tam.F90 (modified) (6 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/DOM/istate_tam.F90

@@ -36 +36 @@
    USE zpshde_tam
    USE eosbn2_tam
+   USE divcur_tam
    USE tstool_tam
    USE gridrandom
@@ -82 +83 @@
       END IF
       numror = 0                              ! define numror = 0 -> no restart file to read
-      CALL day_init()                         ! model calendar (using both namelist and restart infos)
+      !CALL day_init()                         ! model calendar (using both namelist and restart infos)
       !                                       ! Initialization of ocean to zero
       !     before fields       !       now fields
@@ -90 +91 @@
          tsb_tl   (:,:,:,:) = tsn_tl   (:,:,:,:)
          sshb_tl (  :,:) = sshn_tl (  :,:)
-         rotb_tl (:,:,:) = rotn_tl (:,:,:)
-         hdivb_tl(:,:,:) = hdivn_tl(:,:,:)
+         CALL div_cur_tan( nit000 - 1 )
       END IF
       !
@@ -116 +116 @@
       neuler=0
       IF( ln_zps .AND. .NOT. lk_c1d )   &
-            &             CALL zps_hde_adj( nit000, jpts, tsb, gtsu, gtsv, tsb_ad, rhd_ad, &  ! Partial steps: before Horizontal DErivative
+            &             CALL zps_hde_adj( nit000, jpts, tsb, tsb_ad, rhd_ad, &  ! Partial steps: before Horizontal DErivative
             &                                  gtsu_ad, gru_ad,               &  ! of t, s, rd at the bottom ocean level
             &                                  gtsv_ad, grv_ad )
@@ -124 +124 @@
 
       !     before fields       !       now fields
+      CALL div_cur_adj( nit000 - 1 )
       un_ad   (:,:,:) = un_ad(:,:,:) + ub_ad (:,:,:)
       ub_ad   (:,:,:) = 0.0_wp
@@ -132 +133 @@
       sshn_ad   (:,:  ) = sshn_ad(:,:  ) + sshb_ad (:,:  )
       sshb_ad   (:,:  ) = 0.0_wp
-      rotn_ad (:,:,:) = rotn_ad(:,:,:) + rotb_ad (:,:,:)
-      rotb_ad (:,:,:) = 0.0_wp
-      hdivn_ad(:,:,:) = hdivn_ad(:,:,:) + hdivb_ad (:,:,:)
-      hdivb_ad(:,:,:) = 0.0_wp
       !
       rhd_ad  (:,:,:) = 0.0_wp