From 5b339297c368adaf2e2a35210547d43b850fecfa Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Fri, 12 Feb 2021 11:03:42 +0100 Subject: [PATCH] Philippe 12/02/2021: budgets: bugfix: do not call budgets for all SV budgets if LRELAX2FW_ION=T (cherry picked from commit 18e800b5f0188048744a5c11fdcdab84d3eaeb83) --- src/MNH/relaxation.f90 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/MNH/relaxation.f90 b/src/MNH/relaxation.f90 index 13e62a4ab..13fcc955d 100644 --- a/src/MNH/relaxation.f90 +++ b/src/MNH/relaxation.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-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. @@ -255,7 +255,7 @@ END MODULE MODI_RELAXATION !! 06/2011 (M.Chong) Case of ELEC !! 11/2011 (C.Lac) Adaptation to FIT temporal scheme !! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 -!! +! P. Wautelet 12/02/2021: bugfix: do not call budgets for all SV budgets if LRELAX2FW_ION=T !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -720,7 +720,8 @@ IF (LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),11,'REL_BU_RRG') IF (LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),12,'REL_BU_RRH') IF (LBUDGET_SV) THEN DO JSV=1,KSV - CALL BUDGET (PRSVS(:,:,:,JSV),JSV+12,'REL_BU_RSV') + IF ( .NOT. LRELAX2FW_ION .OR. (JSV .NE. NSV_ELECBEG .AND. JSV .NE. NSV_ELECEND)) & + CALL BUDGET (PRSVS(:,:,:,JSV),JSV+12,'REL_BU_RSV') END DO END IF ! -- GitLab