Changeset 2108 for branches/DEV_r1837_MLF

Timestamp:

2010-09-21T21:52:56+02:00 (14 years ago)

Author:

mlelod

Message:

ticket: #663 add heat/salt/volume budgets

Location:

branches/DEV_r1837_MLF/NEMO/OPA_SRC

Files:

• DIA/diahsb.F90 (added)
• IOM/in_out_manager.F90 (modified) (1 diff)
• SBC/sbcmod.F90 (modified) (1 diff)
• TRA/trasbc.F90 (modified) (2 diffs)
• opa.F90 (modified) (2 diffs)
• step.F90 (modified) (2 diffs)

branches/DEV_r1837_MLF/NEMO/OPA_SRC/IOM/in_out_manager.F90

@@ -78 +78 @@
    INTEGER            ::   nn_bench     =    0    !: benchmark parameter (0/1)
    INTEGER            ::   nn_bit_cmp   =    0    !: bit reproducibility  (0/1)
+   LOGICAL            ::   ln_hsb     = .FALSE.   !: check the heat and salt budgets
 
    !                                              !: OLD namelist names

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

@@ -267 +267 @@
             vtau_b(:,:) = vtau(:,:)
             qns_b (:,:) = qns (:,:)
-            qsr_b (:,:) = qsr (:,:)
+            ! qsr_b (:,:) = qsr (:,:)
             emp_b (:,:) = emp (:,:)
             emps_b(:,:) = emps(:,:)

branches/DEV_r1837_MLF/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -127 +127 @@
          qns(:,:) = qns(:,:) + qsr(:,:)      ! total heat flux in qns
          qsr(:,:) = 0.e0                     ! qsr set to zero
-         IF( kt == nit000 ) THEN             ! idem on before field at nit000
-            qsr_b(:,:) = 0.e0                     
-         ENDIF
+         ! IF( kt == nit000 ) THEN             ! idem on before field at nit000
+         !    qsr_b(:,:) = 0.e0                     
+         ! ENDIF
       ENDIF
       !                                          Set before sbc tracer content fields
@@ -186 +186 @@
       !                                          Write in the ocean restart file
       !                                          *******************************
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'sbc : ocean surface tracer content forcing fields written in ocean restart file ',   &
-           &                    'at it= ', kt,' date= ', ndastp
-      IF(lwp) WRITE(numout,*) '~~~~'
-      CALL iom_rstput( kt, nitrst, numrow, 'sbc_hc_b', sbc_hc_n )
-      CALL iom_rstput( kt, nitrst, numrow, 'sbc_sc_b', sbc_sc_n )
+      IF( lrst_oce ) THEN
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) 'sbc : ocean surface tracer content forcing fields written in ocean restart file ',   &
+            &                    'at it= ', kt,' date= ', ndastp
+         IF(lwp) WRITE(numout,*) '~~~~'
+         CALL iom_rstput( kt, nitrst, numrow, 'sbc_hc_b', sbc_hc_n )
+         CALL iom_rstput( kt, nitrst, numrow, 'sbc_sc_b', sbc_sc_n )
+      ENDIF
       
       IF( l_trdtra ) THEN           ! save the sbc trends for diagnostic

branches/DEV_r1837_MLF/NEMO/OPA_SRC/opa.F90

@@ -180 +180 @@
       !!
       NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   &
-         &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle, nn_bench, nn_bit_cmp
+         &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle, nn_bench, nn_bit_cmp, ln_hsb
       !!----------------------------------------------------------------------
       !
@@ -313 +313 @@
          WRITE(numout,*) '      benchmark parameter (0/1)       nn_bench   = ', nn_bench
          WRITE(numout,*) '      bit comparison mode (0/1)       nn_bit_cmp = ', nn_bit_cmp
+         WRITE(numout,*) '      check the heat and salt budgets ln_hsb     = ', ln_hsb
       ENDIF
 

branches/DEV_r1837_MLF/NEMO/OPA_SRC/step.F90

@@ -117 +117 @@
    USE prtctl          ! Print control                    (prt_ctl routine)
    ! - ML - 
-   USE diatrb          ! global tracer conservation       (dia_trb  routine)
+   USE diahsb          ! global tracer conservation       (dia_hsb  routine)
 
 #if defined key_agrif
@@ -320 +320 @@
 
                                CALL ssh_nxt( kstp )         ! sea surface height at next time step
-                               CALL dia_trb( kstp )         ! - ML - global conservation diagnostics
+      IF( ln_hsb           )   CALL dia_hsb( kstp )         ! - ML - global conservation diagnostics
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>