Changeset 2068 for branches/DEV_r1837_MLF/NEMO/OPA_SRC/SBC/sbcmod.F90

Timestamp:

2010-09-06T17:56:51+02:00 (14 years ago)

Author:

mlelod

Message:

ticket: #663 ensuring restartability and conservation

File:

• branches/DEV_r1837_MLF/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (3 diffs)

branches/DEV_r1837_MLF/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -194 +194 @@
          utau_b(:,:) = utau(:,:)                         ! Swap the ocean forcing fields
          vtau_b(:,:) = vtau(:,:)                         ! (except at nit000 where before fields
-         qns_b (:,:) = qns (:,:)                         !  are set the end of the routine)
+         qns_b (:,:) = qns (:,:)                         !  are set at the end of the routine)
          qsr_b (:,:) = qsr (:,:)
          emp_b (:,:) = emp (:,:)
          emps_b(:,:) = emps(:,:)
          ! - ML -
-         sbc_trd_hc_b(:,:) = sbc_trd_hc_n(:,:)
-         qsr_trd_hc_b(:,:,:) = qsr_trd_hc_n(:,:,:)
-         IF ( .NOT. lk_vvl )  sbc_trd_sc_b(:,:) = sbc_trd_sc_n(:,:)
+         ! sbc_trd_hc_b(:,:) = sbc_trd_hc_n(:,:)
+         ! qsr_trd_hc_b(:,:,:) = qsr_trd_hc_n(:,:,:)
+         ! IF ( .NOT. lk_vvl )  sbc_trd_sc_b(:,:) = sbc_trd_sc_n(:,:)
          
       ENDIF
@@ -265 +265 @@
             CALL iom_get( numror, jpdom_autoglo, 'qsr_b' , qsr_b  )   ! before     solar heat flux (T-point)
             CALL iom_get( numror, jpdom_autoglo, 'emp_b' , emp_b  )   ! before     freshwater flux (T-point)
-            CALL iom_get( numror, jpdom_autoglo, 'emps_b', emp_b  )   ! before C/D freshwater flux (T-point)
+            CALL iom_get( numror, jpdom_autoglo, 'emps_b', emps_b )   ! before C/D freshwater flux (T-point)
             ! - ML -
-            CALL iom_get( numror, jpdom_autoglo, 'sbc_trd_hc_b', sbc_trd_hc_b )   ! before heat content sbc trend
-            CALL iom_get( numror, jpdom_autoglo, 'qsr_trd_hc_b', qsr_trd_hc_b )   ! before heat content trend due to Qsr flux
-            IF ( .NOT. lk_vvl ) THEN
-               CALL iom_get( numror, jpdom_autoglo, 'sbc_trd_sc_b', sbc_trd_sc_b )   ! before salt content sbc trend
-            ENDIF
+            ! CALL iom_get( numror, jpdom_autoglo, 'sbc_trd_hc_b', sbc_trd_hc_b )   ! before heat content sbc trend
+            ! CALL iom_get( numror, jpdom_autoglo, 'qsr_trd_hc_b', qsr_trd_hc_b )   ! before heat content trend due to Qsr flux
+            ! IF ( .NOT. lk_vvl ) THEN
+            !    CALL iom_get( numror, jpdom_autoglo, 'sbc_trd_sc_b', sbc_trd_sc_b )   ! before salt content sbc trend
+            ! ENDIF
             !
          ELSE                                                   !* no restart: set from nit000 values
@@ -291 +291 @@
             &                    'at it= ', kt,' date= ', ndastp
          IF(lwp) WRITE(numout,*) '~~~~'
-         CALL iom_rstput( kt, nitrst, numrow, 'utau_b' , utau_b )    ! 
-         CALL iom_rstput( kt, nitrst, numrow, 'vtau_b' , vtau_b )
-         CALL iom_rstput( kt, nitrst, numrow, 'qns_b'  , qns_b  )
-         CALL iom_rstput( kt, nitrst, numrow, 'qsr_b'  , qsr_b  )
-         CALL iom_rstput( kt, nitrst, numrow, 'emp_b'  , emp_b  )
-         CALL iom_rstput( kt, nitrst, numrow, 'emps_b' , emps_b )
+         CALL iom_rstput( kt, nitrst, numrow, 'utau_b' , utau )    ! 
+         CALL iom_rstput( kt, nitrst, numrow, 'vtau_b' , vtau )
+         CALL iom_rstput( kt, nitrst, numrow, 'qns_b'  , qns  )
+         CALL iom_rstput( kt, nitrst, numrow, 'qsr_b'  , qsr  )
+         CALL iom_rstput( kt, nitrst, numrow, 'emp_b'  , emp  )
+         CALL iom_rstput( kt, nitrst, numrow, 'emps_b' , emps )
          ! - ML -
-         CALL iom_rstput( kt, nitrst, numrow, 'sbc_trd_hc_b', sbc_trd_hc_b )
-         CALL iom_rstput( kt, nitrst, numrow, 'qsr_trd_hc_b', qsr_trd_hc_b )
-         IF ( .NOT. lk_vvl ) THEN
-            CALL iom_rstput( kt, nitrst, numrow, 'sbc_trd_sc_b', sbc_trd_sc_b )
-         ENDIF
+         ! CALL iom_rstput( kt, nitrst, numrow, 'sbc_trd_hc_b', sbc_trd_hc_n )
+         ! CALL iom_rstput( kt, nitrst, numrow, 'qsr_trd_hc_b', qsr_trd_hc_n )
+         ! IF ( .NOT. lk_vvl ) THEN
+         !    CALL iom_rstput( kt, nitrst, numrow, 'sbc_trd_sc_b', sbc_trd_sc_n )
+         ! ENDIF
          !
       ENDIF