Merge pull request #695 from FESOM/fix_ldiag_destine_for_esm_tools

capitalization messes up f90nml reader in esm_tools.

Author: JanStreffing

config/namelist.io

@@ -9,7 +9,7 @@ ldiag_dMOC       =.false.
 ldiag_DVD        =.false.
 ldiag_forc       =.false.
 ldiag_extflds    =.false.
-ldiag_destinE    =.false. ! enables computation of heatcontent. (hc300m, hc700m, hc) in io_list
+ldiag_destine    =.false. ! enables computation of heatcontent. (hc300m, hc700m, hc) in io_list
 ldiag_trflx      =.false.
 ldiag_uvw_sqr    =.false.
 ldiag_trgrd_xyz  =.false.
@@ -58,4 +58,4 @@ io_list =  'sst       ',1, 'm', 4,
            'fw        ',1, 'm', 4,
            'fh        ',1, 'm', 4,
            'otracers  ',1, 'y', 4,
-/
+/

src/gen_modules_diag.F90

@@ -22,7 +22,7 @@ module diagnostics
   public :: ldiag_solver, lcurt_stress_surf, ldiag_Ri, ldiag_TurbFlux, ldiag_dMOC,                                &
             ldiag_forc, ldiag_salt3D, ldiag_curl_vel3, diag_list, ldiag_extflds, ldiag_ice,      &
             compute_diagnostics, rhs_diag, curl_stress_surf, curl_vel3, shear, Ri, KvdTdZ, KvdSdZ,                & 
-            std_dens_min, std_dens_max, std_dens_N, std_dens, ldiag_trflx, ldiag_destinE,                                       &
+            std_dens_min, std_dens_max, std_dens_N, std_dens, ldiag_trflx, ldiag_destine,                                       &
             std_dens_UVDZ, std_dens_DIV, std_dens_DIV_fer, std_dens_Z, std_dens_H, std_dens_dVdT, std_dens_flux,  &
             dens_flux_e, zisotherm, tempzavg, saltzavg, heatcontent, vol_ice, vol_snow, compute_ice_diag, thetao,   &
             tuv, suv,                                                                                             &
@@ -98,15 +98,15 @@ module diagnostics
   logical                                       :: ldiag_forc       =.false.
 
   logical                                       :: ldiag_extflds    =.false.
-  logical                                       :: ldiag_destinE    =.false.
+  logical                                       :: ldiag_destine    =.false.
   logical                                       :: ldiag_ice        =.false.
   logical                                       :: ldiag_trflx      =.false.
   logical                                       :: ldiag_uvw_sqr    =.false.
   logical                                       :: ldiag_trgrd_xyz  =.false.
 
   namelist /diag_list/ ldiag_solver, lcurt_stress_surf, ldiag_curl_vel3, ldiag_Ri, & 
                        ldiag_TurbFlux, ldiag_dMOC, ldiag_DVD, ldiag_salt3D, ldiag_forc, &
-                       ldiag_extflds, ldiag_destinE, ldiag_trflx, ldiag_ice, ldiag_uvw_sqr, ldiag_trgrd_xyz
+                       ldiag_extflds, ldiag_destine, ldiag_trflx, ldiag_ice, ldiag_uvw_sqr, ldiag_trgrd_xyz
 
   contains
 
@@ -1127,7 +1127,7 @@ subroutine compute_diagnostics(mode, dynamics, tracers, ice, partit, mesh)
   ! 13. compute fields required for for destinE
   if (ldiag_ice)         call compute_ice_diag(mode, ice, partit, mesh)
 
-  if (ldiag_destinE)     call compute_destinE(mode, dynamics, tracers, partit, mesh)
+  if (ldiag_destine)     call compute_destinE(mode, dynamics, tracers, partit, mesh)
 
   call compute_thetao(mode, tracers, partit, mesh) 
 

src/io_meandata.F90

@@ -366,15 +366,15 @@ subroutine ini_mean_io(ice, dynamics, tracers, partit, mesh)
 !_______________________________________________________________________________
 ! output heat content (for destine)
 CASE ('hc300m')
-    if (ldiag_destinE) then
+    if (ldiag_destine) then
         call def_stream(nod2D, myDim_nod2D, 'hc300m', 'Vertically integrated heat content upper 300m',   'J m**-2', heatcontent(1:myDim_nod2D,1), io_list(i)%freq, io_list(i)%unit, io_list(i)%precision, partit, mesh)
     end if 
 CASE ('hc700m')
-    if (ldiag_destinE) then
+    if (ldiag_destine) then
         call def_stream(nod2D, myDim_nod2D, 'hc700m', 'Vertically integrated heat content upper 700m',   'J m**-2', heatcontent(1:myDim_nod2D,2), io_list(i)%freq, io_list(i)%unit, io_list(i)%precision, partit, mesh)
     end if 
 CASE ('hc')
-    if (ldiag_destinE) then
+    if (ldiag_destine) then
         call def_stream(nod2D, myDim_nod2D, 'hc',     'Vertically integrated heat content total column', 'J m**-2', heatcontent(1:myDim_nod2D,3), io_list(i)%freq, io_list(i)%unit, io_list(i)%precision, partit, mesh)
     end if 
 !_______________________________________________________________________________