Changeset 4166 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2013-11-08T06:51:52+01:00 (11 years ago)

Author:

cetlod

Message:

dev_LOCEAN_2013 : bugs corrections, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90

@@ -26 +26 @@
    USE restart         ! ocean restart
    USE wrk_nemo         ! work arrays
+   USE sbcrnf         ! river runoffd
 
    IMPLICIT NONE
@@ -196 +197 @@
       !!
       NAMELIST/namhsb/ ln_diahsb
+      !
+      INTEGER  ::   ios
       !!----------------------------------------------------------------------
-      !
-      REWIND ( numnam )              ! Read Namelist namhsb 
-      READ   ( numnam, namhsb )
+
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'dia_hsb_init : check the heat and salt budgets'
+         WRITE(numout,*) '~~~~~~~~ '
+      ENDIF
+
+      REWIND( numnam_ref )              ! Namelist namhsb in reference namelist
+      READ  ( numnam_ref, namhsb, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namhsb in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namhsb in configuration namelist
+      READ  ( numnam_cfg, namhsb, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namhsb in configuration namelist', lwp )
+      WRITE ( numond, namhsb )
+
       !
       IF(lwp) THEN                   ! Control print
          WRITE(numout,*)
-         WRITE(numout,*) 'dia_hsb_init : check the heat and salt budgets'
-         WRITE(numout,*) '~~~~~~~~~~~~'
          WRITE(numout,*) '   Namelist namhsb : set hsb parameters'
          WRITE(numout,*) '      Switch for hsb diagnostic (T) or not (F)  ln_diahsb  = ', ln_diahsb