From 16568a424b3509c8efd1d3dc212c15c538fa66d5 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Wed, 17 Feb 2021 10:16:58 +0100 Subject: [PATCH] Philippe 17/02/2021: budgets: bugfix for REL term for SV budgets (if electricity) (cherry picked from commit 446fca13aa3808e7726fd721bff578eecc6e3c9c) --- src/MNH/ini_budget.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90 index 27cb901e7..3cb3b1c27 100644 --- a/src/MNH/ini_budget.f90 +++ b/src/MNH/ini_budget.f90 @@ -187,7 +187,7 @@ USE MODD_DYN USE MODD_CONF USE MODD_PARAM_ICE USE MODD_PARAM_C2R2 -USE MODD_ELEC_DESCR, ONLY : LINDUCTIVE +USE MODD_ELEC_DESCR, ONLY : LINDUCTIVE, LRELAX2FW_ION USE MODD_2D_FRC USE MODD_NSV USE MODD_PARAM_LIMA, ONLY : OAERO_MASS=>LAERO_MASS, & @@ -2797,7 +2797,7 @@ IF (LBU_RSV) THEN IPROC=IPROC+1 IF ( ONUMDIFSV ) IPROACTV(12+JSV,IPROC) = NDIFSV IPROC=IPROC+1 - IF ( OHORELAX_SV(JSV) ) THEN + IF ( OHORELAX_SV(JSV) .OR. ( CELEC /= 'NONE' .AND. LRELAX2FW_ION .AND. (JSV == NSV_ELECBEG .OR. JSV == NSV_ELECEND ) ) ) THEN IPROACTV(12+JSV,IPROC) = NRELSV ELSE IF(OVE_RELAX .OR. OVE_RELAX_GRD .OR. OHORELAX_UVWTH .OR. OHORELAX_RV .OR. & -- GitLab