Ignore:
Timestamp:
2019-06-11T14:59:01+02:00 (18 months ago)
Author:
agn
Message:

diahth outputs now controlled only by xml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/releases/release-4.0/src/OCE/DIA/diahth.F90

    r11094 r11096  
    3030   PUBLIC   dia_hth_init  ! routine called by nemogcm.F90 
    3131 
    32    LOGICAL, PUBLIC ::   ln_diahth   !: Compute further diagnostics of ML and thermocline depth 
     32   LOGICAL, PUBLIC ::   ll_diahth   !: Compute further diagnostics of ML and thermocline depth 
    3333 
    3434   !!---------------------------------------------------------------------- 
     
    8989     REAL(wp), DIMENSION(jpi,jpj) ::   zhtc3   !: heat content of first 300 m                    [W] 
    9090 
    91      IF (iom_use("mlddzt").OR.iom_use("mldr0_3").OR.iom_use("mldr0_1")) THEN 
     91     IF (iom_use("mlddzt") .OR. iom_use("mldr0_3") .OR. iom_use("mldr0_1")) THEN 
    9292        ! ------------------------------------------------------------- ! 
    9393        ! thermocline depth: strongest vertical gradient of temperature ! 
     
    147147     ENDIF 
    148148 
    149      IF (iom_use("mld_dt02").OR.iom_use("topthdep").OR.iom_use("mldr10_3").OR. & 
    150           & iom_use("pycndep").OR.iom_use("tinv").OR.iom_use("depti")) THEN 
     149     IF (iom_use("mld_dt02") .OR. iom_use("topthdep") .OR. iom_use("mldr10_3") .OR. & 
     150          & iom_use("pycndep") .OR. iom_use("tinv") .OR. iom_use("depti")) THEN 
    151151        DO jj = 1, jpj 
    152152           DO ji = 1, jpi 
     
    223223     ENDIF 
    224224 
    225      IF(iom_use("20d").OR.iom_use("28d")) THEN 
     225     IF(iom_use("20d") .OR. iom_use("28d")) THEN 
    226226        ! ----------------------------------- ! 
    227227        ! search deepest level above 20C/28C  ! 
     
    318318      !! ** Purpose: Initialization for ML and thermocline depths 
    319319      !! 
    320       !! ** Action : Read namelist flag to permit or not extra Ml depths and thermocline depths 
    321       !!--------------------------------------------------------------------------- 
    322       INTEGER ::   ierror, ios   ! local integer 
    323       !! 
    324       NAMELIST/namhth/ ln_diahth 
     320      !! ** Action : If any upper ocean diagnostic required by xml file, set in dia_hth 
    325321      !!--------------------------------------------------------------------------- 
    326322       ! 
     
    330326         WRITE(numout,*) '~~~~~~~~~~~~ ' 
    331327      ENDIF 
    332       REWIND( numnam_ref )              ! Namelist namhth in reference namelist 
    333       READ  ( numnam_ref, namhth, IOSTAT = ios, ERR = 901) 
    334 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namhth in reference namelist', lwp ) 
    335       REWIND( numnam_cfg )              ! Namelist namhth in configuration namelist 
    336       READ  ( numnam_cfg, namhth, IOSTAT = ios, ERR = 902 ) 
    337 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namhth in configuration namelist', lwp ) 
    338       IF(lwm) WRITE( numond, namhth ) 
    339  
     328      ll_diahth = iom_use("mlddzt") .OR. iom_use("mldr0_3") .OR. iom_use("mldr0_1") .OR.  & 
     329           & iom_use("mld_dt02") .OR. iom_use("topthdep") .OR. iom_use("mldr10_3") .OR.  & 
     330           & iom_use("pycndep") .OR. iom_use("tinv") .OR. iom_use("depti"). OR. & 
     331           & iom_use("20d") .OR. iom_use("28d") .OR. iom_use("hc300") 
    340332      IF(lwp) THEN 
    341          WRITE(numout,*) '   Namelist  namhth :' 
    342          WRITE(numout,*) '      check the heat and salt budgets (T) or not (F)       ln_diahth = ', ln_diahth 
     333         WRITE(numout,*) '   output upper ocean diagnostics (T) or not (F)       ll_diahth = ', ll_diahth 
    343334      ENDIF 
    344335      ! 
Note: See TracChangeset for help on using the changeset viewer.