Changeset 3094 for branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

Timestamp:

2011-11-14T16:28:04+01:00 (12 years ago)

Author:

acc

Message:

Branch dev_NOC_UKMO_MERGE #890. Step 2. Merge in changes from the dev_UKM0_2011 branch with unwanted changes reverted

File:

• branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) (2 diffs)

branches/2011/dev_NOC_UKMO_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

@@ -18 +18 @@
    USE lib_mpp         ! distributed memory computing library
    USE trabbc          ! bottom boundary condition
+   USE obc_par         ! (for lk_obc)
    USE bdy_par         ! (for lk_bdy)
-   USE obc_par         ! (for lk_obc)
 
    IMPLICIT NONE
@@ -205 +205 @@
       WRITE(numout,*) "dia_hsb: heat salt volume budgets activated"
       WRITE(numout,*) "~~~~~~~  output written in the 'heat_salt_volume_budgets.txt' ASCII file"
-      IF( lk_obc .OR. lk_bdy) THEN
+      IF( lk_obc .or. lk_bdy ) THEN
          CALL ctl_warn( 'dia_hsb does not take open boundary fluxes into account' )         
       ENDIF