From 865a2482ffc726c4461d4493458a16658dd6072d Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Thu, 12 Mar 2020 16:45:52 +0100 Subject: [PATCH] Philippe 12/03/2020: budgets: fix condition for NEADV and NETURB budgets (cherry picked from commit b2f1ef69bc9c70f50bac5ff3a8be7082a72da30c) --- src/MNH/advection_metsv.f90 | 2 +- src/MNH/turb.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90 index 5ea23bf85..b42f0e8b2 100644 --- a/src/MNH/advection_metsv.f90 +++ b/src/MNH/advection_metsv.f90 @@ -778,7 +778,7 @@ SELECT CASE ( HCLOUD ) ! END SELECT ! -IF ((HCLOUD == 'ICE3') .OR. (HCLOUD == 'ICE4') .OR. (HCLOUD == 'KHKO') .OR. (HCLOUD /= 'C2R2') .OR. (HCLOUD /= 'LIMA') ) THEN +IF ((HCLOUD == 'ICE3') .OR. (HCLOUD == 'ICE4') .OR. (HCLOUD == 'KHKO') .OR. (HCLOUD == 'C2R2') .OR. (HCLOUD == 'LIMA') ) THEN IF (LBUDGET_TH) CALL BUDGET (PRTHS(:,:,:) , 4,'NEADV_BU_RTH') IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), 6,'NEADV_BU_RRV') IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), 7,'NEADV_BU_RRC') diff --git a/src/MNH/turb.f90 b/src/MNH/turb.f90 index 061191b1e..8569cce72 100644 --- a/src/MNH/turb.f90 +++ b/src/MNH/turb.f90 @@ -1216,7 +1216,7 @@ SELECT CASE ( HCLOUD ) ! END SELECT ! -IF ((HCLOUD == 'ICE3') .OR. (HCLOUD == 'ICE4') .OR. (HCLOUD == 'KHKO') .OR. (HCLOUD /= 'C2R2') .OR. (HCLOUD /= 'LIMA') ) THEN +IF ((HCLOUD == 'ICE3') .OR. (HCLOUD == 'ICE4') .OR. (HCLOUD == 'KHKO') .OR. (HCLOUD == 'C2R2') .OR. (HCLOUD == 'LIMA') ) THEN IF (LBUDGET_TH) CALL BUDGET (PRTHLS(:,:,:), 4,'NETUR_BU_RTH') IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), 6,'NETUR_BU_RRV') IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), 7,'NETUR_BU_RRC') -- GitLab