Changeset 2091 for branches/DEV_r1837_MLF/NEMO/OPA_SRC/SBC

Timestamp:

2010-09-14T22:29:38+02:00 (14 years ago)

Author:

mlelod

Message:

ticket: #663 cosmetic changes

Location:

branches/DEV_r1837_MLF/NEMO/OPA_SRC/SBC

Files:

• sbc_oce.F90 (modified) (1 diff)
• sbcmod.F90 (modified) (4 diffs)

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

@@ -53 +53 @@
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   emp_tot           !: total E-P-R over ocean and ice               [Kg/m2/s]
    ! - ML - begin
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_trd_hc_n      !: sbc heat content trend now                   [K/m/s]
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_trd_hc_b      !:  "   "      "      "   before                   "
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_trd_sc_n      !: sbc salt content trend now                   [psu/m/s]
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_trd_sc_b      !:  "   "      "      "   before                   "
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   qsr_trd_hc_n  !: heat content trend due to qsr flux now       [K/m/s]
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   qsr_trd_hc_b  !:  "      "      "    "  "   "   "   before       "
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_hc_n          !: sbc heat content trend now                   [K/m/s]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_hc_b          !:  "   "      "      "   before                   "
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_sc_n          !: sbc salt content trend now                   [psu/m/s]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sbc_sc_b          !:  "   "      "      "   before                   "
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   qsr_hc_n      !: heat content trend due to qsr flux now       [K/m/s]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   qsr_hc_b      !:  "      "      "    "  "   "   "   before       "
    ! - ML - end
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   tprecip           !: total precipitation                          [Kg/m2/s]

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

@@ -198 +198 @@
          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(:,:)
          
       ENDIF
@@ -266 +262 @@
             CALL iom_get( numror, jpdom_autoglo, 'emp_b' , emp_b  )   ! before     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
-            !
          ELSE                                                   !* no restart: set from nit000 values
             IF(lwp) WRITE(numout,*) '          nit000-1 surface forcing fields set to nit000'
@@ -291 +280 @@
             &                    'at it= ', kt,' date= ', ndastp
          IF(lwp) WRITE(numout,*) '~~~~'
-         CALL iom_rstput( kt, nitrst, numrow, 'utau_b' , utau )    ! 
+         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  )
@@ -297 +286 @@
          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_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