From c4da477cef55d83ae4065f6878612080348a2c24 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Wed, 9 Jun 2021 11:35:46 +0200 Subject: [PATCH] Philippe 09/06/2021: budgets: modify slightly condition to enable TKE budgets --- src/MNH/budget_flags.f90 | 4 ++-- src/MNH/ini_budget.f90 | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/MNH/budget_flags.f90 b/src/MNH/budget_flags.f90 index 1d14d21ad..ba8cdde35 100644 --- a/src/MNH/budget_flags.f90 +++ b/src/MNH/budget_flags.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2021 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -96,7 +96,7 @@ LBUDGET_U = (LBU_ENABLE .AND. LBU_RU ) .OR. (LLES_CALL .OR. LCHECK ) LBUDGET_V = (LBU_ENABLE .AND. LBU_RV ) .OR. (LLES_CALL .OR. LCHECK ) LBUDGET_W = (LBU_ENABLE .AND. LBU_RW ) .OR. (LLES_CALL .OR. LCHECK ) LBUDGET_TH = (LBU_ENABLE .AND. LBU_RTH ) .OR. (LLES_CALL .OR. LCHECK ) -LBUDGET_TKE= ( (LBU_ENABLE .AND. LBU_RTKE) .OR. (LLES_CALL .OR. LCHECK ) ) .AND. CTURB /= 'NONE' +LBUDGET_TKE= ( (LBU_ENABLE .AND. LBU_RTKE) .OR. (LLES_CALL .OR. LCHECK ) ) .AND. CTURB == 'TKEL' LBUDGET_RV = ( (LBU_ENABLE .AND. LBU_RRV ) .OR. ((LLES_CALL .OR. LCHECK ).AND. OUSERV) ) .AND. NRR >= 1 LBUDGET_RC = ( (LBU_ENABLE .AND. LBU_RRC ) .OR. ((LLES_CALL .OR. LCHECK ).AND. OUSERC) ) .AND. NRR >= 2 LBUDGET_RR = ( (LBU_ENABLE .AND. LBU_RRR ) .OR. ((LLES_CALL .OR. LCHECK ).AND. OUSERR) ) .AND. NRR >= 3 diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90 index 0c22dd667..2739496c7 100644 --- a/src/MNH/ini_budget.f90 +++ b/src/MNH/ini_budget.f90 @@ -1307,27 +1307,27 @@ if ( lbu_rtke ) then tzsource%cmnhname = 'DP' tzsource%clongname = 'dynamic production' - tzsource%lavailable = hturb == 'TKEL' + tzsource%lavailable = .true. call Budget_source_add( tbudgets(NBUDGET_TKE), tzsource ) tzsource%cmnhname = 'TP' tzsource%clongname = 'thermal production' - tzsource%lavailable = hturb == 'TKEL' + tzsource%lavailable = .true. call Budget_source_add( tbudgets(NBUDGET_TKE), tzsource ) tzsource%cmnhname = 'DISS' tzsource%clongname = 'dissipation of TKE' - tzsource%lavailable = hturb == 'TKEL' + tzsource%lavailable = .true. call Budget_source_add( tbudgets(NBUDGET_TKE), tzsource ) tzsource%cmnhname = 'TR' tzsource%clongname = 'turbulent transport' - tzsource%lavailable = hturb == 'TKEL' + tzsource%lavailable = .true. call Budget_source_add( tbudgets(NBUDGET_TKE), tzsource ) tzsource%cmnhname = 'ADV' tzsource%clongname = 'total advection' - tzsource%lavailable = hturb == 'TKEL' + tzsource%lavailable = .true. call Budget_source_add( tbudgets(NBUDGET_TKE), tzsource ) -- GitLab