Changeset 11096

Timestamp:

2019-06-11T14:59:01+02:00 (5 years ago)

Author:

agn

Message:

diahth outputs now controlled only by xml

Location:

NEMO/releases/release-4.0

Files:

• cfgs/SHARED/namelist_ref (modified) (2 diffs)
• src/OCE/C1D/step_c1d.F90 (modified) (1 diff)
• src/OCE/DIA/diahth.F90 (modified) (6 diffs)
• src/OCE/step.F90 (modified) (1 diff)

NEMO/releases/release-4.0/cfgs/SHARED/namelist_ref

@@ -1100 +1100 @@
 !!   namptr       Poleward Transport Diagnostics                        (default: OFF)
 !!   namhsb       Heat and salt budgets                                 (default: OFF)
-!!   namhth       Extra ML depth and thermocline diagnostics            (default: OFF)
 !!   namdiu       Cool skin and warm layer models                       (default: OFF)
 !!   namdiu       Cool skin and warm layer models                       (default: OFF)
@@ -1141 +1140 @@
 !-----------------------------------------------------------------------
    ln_diahsb   = .false.   !  check the heat and salt budgets (T) or not (F)
-/
-!-----------------------------------------------------------------------
-&namhth        !  Extra ML depth and thermocline depth diagnostics      (default F)
-!-----------------------------------------------------------------------
-   ln_diahth   = .false.   !  produce extra diagnostics of BL and thermocline depth
 /
 !-----------------------------------------------------------------------

NEMO/releases/release-4.0/src/OCE/C1D/step_c1d.F90

@@ -86 +86 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                          CALL dia_wri( kstp )       ! ocean model: outputs
-      IF( ln_diahth  )   CALL dia_hth( kstp )       ! Thermocline depth (20°C)
+      IF( ll_diahth  )   CALL dia_hth( kstp )       ! Thermocline depth (20°C)
 
 

NEMO/releases/release-4.0/src/OCE/DIA/diahth.F90

@@ -30 +30 @@
    PUBLIC   dia_hth_init  ! routine called by nemogcm.F90
 
-   LOGICAL, PUBLIC ::   ln_diahth   !: Compute further diagnostics of ML and thermocline depth
+   LOGICAL, PUBLIC ::   ll_diahth   !: Compute further diagnostics of ML and thermocline depth
 
    !!----------------------------------------------------------------------
@@ -89 +89 @@
      REAL(wp), DIMENSION(jpi,jpj) ::   zhtc3   !: heat content of first 300 m                    [W]
 
-     IF (iom_use("mlddzt").OR.iom_use("mldr0_3").OR.iom_use("mldr0_1")) THEN
+     IF (iom_use("mlddzt") .OR. iom_use("mldr0_3") .OR. iom_use("mldr0_1")) THEN
         ! ------------------------------------------------------------- !
         ! thermocline depth: strongest vertical gradient of temperature !
@@ -147 +147 @@
      ENDIF
 
-     IF (iom_use("mld_dt02").OR.iom_use("topthdep").OR.iom_use("mldr10_3").OR. &
-          & iom_use("pycndep").OR.iom_use("tinv").OR.iom_use("depti")) THEN
+     IF (iom_use("mld_dt02") .OR. iom_use("topthdep") .OR. iom_use("mldr10_3") .OR.  &
+          & iom_use("pycndep") .OR. iom_use("tinv") .OR. iom_use("depti")) THEN
         DO jj = 1, jpj
            DO ji = 1, jpi
@@ -223 +223 @@
      ENDIF
 
-     IF(iom_use("20d").OR.iom_use("28d")) THEN
+     IF(iom_use("20d") .OR. iom_use("28d")) THEN
         ! ----------------------------------- !
         ! search deepest level above 20C/28C  !
@@ -318 +318 @@
       !! ** Purpose: Initialization for ML and thermocline depths
       !!
-      !! ** Action : Read namelist flag to permit or not extra Ml depths and thermocline depths
-      !!---------------------------------------------------------------------------
-      INTEGER ::   ierror, ios   ! local integer
-      !!
-      NAMELIST/namhth/ ln_diahth
+      !! ** Action : If any upper ocean diagnostic required by xml file, set in dia_hth
       !!---------------------------------------------------------------------------
        !
@@ -330 +326 @@
          WRITE(numout,*) '~~~~~~~~~~~~ '
       ENDIF
-      REWIND( numnam_ref )              ! Namelist namhth in reference namelist
-      READ  ( numnam_ref, namhth, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namhth in reference namelist', lwp )
-      REWIND( numnam_cfg )              ! Namelist namhth in configuration namelist
-      READ  ( numnam_cfg, namhth, IOSTAT = ios, ERR = 902 )
-902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namhth in configuration namelist', lwp )
-      IF(lwm) WRITE( numond, namhth )
-
+      ll_diahth = iom_use("mlddzt") .OR. iom_use("mldr0_3") .OR. iom_use("mldr0_1") .OR.  &
+           & iom_use("mld_dt02") .OR. iom_use("topthdep") .OR. iom_use("mldr10_3") .OR.  &
+           & iom_use("pycndep") .OR. iom_use("tinv") .OR. iom_use("depti"). OR. &
+           & iom_use("20d") .OR. iom_use("28d") .OR. iom_use("hc300")
       IF(lwp) THEN
-         WRITE(numout,*) '   Namelist  namhth :'
-         WRITE(numout,*) '      check the heat and salt budgets (T) or not (F)       ln_diahth = ', ln_diahth
+         WRITE(numout,*) '   output upper ocean diagnostics (T) or not (F)       ll_diahth = ', ll_diahth
       ENDIF
       !

NEMO/releases/release-4.0/src/OCE/step.F90

@@ -214 +214 @@
       IF( lk_floats  )   CALL flo_stp( kstp )         ! drifting Floats
       IF( ln_diacfl  )   CALL dia_cfl( kstp )         ! Courant number diagnostics
-      IF( ln_diahth  )   CALL dia_hth( kstp )         ! Thermocline depth (20 degres isotherm depth)
+      IF( ll_diahth  )   CALL dia_hth( kstp )         ! Thermocline depth (20 degres isotherm depth)
       IF( lk_diadct  )   CALL dia_dct( kstp )         ! Transports
                          CALL dia_ar5( kstp )         ! ar5 diag