From c00dd0394a35546fd571477e691be3063989b02c Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Tue, 5 May 2020 10:03:23 +0200
Subject: [PATCH] Revert "Philippe 27/04/2020: budgets: remove unused
variables"
This reverts commit c7dd2ef4148d49426a1b10c1dd2cbf1f5589dd29.
---
src/MNH/les_budget.f90 | 4 ++++
src/MNH/les_ini_timestepn.f90 | 8 ++++++++
src/MNH/lesn.f90 | 4 ++++
src/MNH/modd_les_budget.f90 | 6 +++++-
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/MNH/les_budget.f90 b/src/MNH/les_budget.f90
index 13936fea3..da9b09c20 100644
--- a/src/MNH/les_budget.f90
+++ b/src/MNH/les_budget.f90
@@ -132,6 +132,7 @@ SELECT CASE (KBUDN)
X_LES_BU_RES_KE(:,ILES_BU) = X_LES_BU_RES_KE(:,ILES_BU) + ZLES_PROF(:)
!
!* update fields
+ XCURRENT_RUS = PVARS
XU_ANOM = ZANOM
!
!* v
@@ -145,6 +146,7 @@ SELECT CASE (KBUDN)
X_LES_BU_RES_KE(:,ILES_BU) = X_LES_BU_RES_KE(:,ILES_BU) + ZLES_PROF(:)
!
!* update fields
+ XCURRENT_RVS = PVARS
XV_ANOM = ZANOM
!
!* w
@@ -177,6 +179,7 @@ SELECT CASE (KBUDN)
END DO
!
!* update fields
+ XCURRENT_RWS = PVARS
XW_ANOM = ZANOM
!
!* Th
@@ -312,6 +315,7 @@ SELECT CASE (KBUDN)
X_LES_BU_RES_SV2(:,ILES_BU,KBUDN-(NBUDGET_SV1-1)) = X_LES_BU_RES_SV2(:,ILES_BU,KBUDN-(NBUDGET_SV1-1)) + ZLES_PROF(:)
!
!* update fields
+ XCURRENT_RSVS(:,:,:,KBUDN-(NBUDGET_SV1-1)) = PVARS
XSV_ANOM(:,:,:,KBUDN-(NBUDGET_SV1-1)) = ZANOM
END SELECT
diff --git a/src/MNH/les_ini_timestepn.f90 b/src/MNH/les_ini_timestepn.f90
index 786ba3e3a..996e6b628 100644
--- a/src/MNH/les_ini_timestepn.f90
+++ b/src/MNH/les_ini_timestepn.f90
@@ -282,15 +282,23 @@ LCURRENT_USERH=LUSERH
!
NCURRENT_RR = NRR
!
+ALLOCATE(XCURRENT_RUS (IIU,IJU,IKU))
+ALLOCATE(XCURRENT_RVS (IIU,IJU,IKU))
+ALLOCATE(XCURRENT_RWS (IIU,IJU,IKU))
ALLOCATE(XCURRENT_RTHS (IIU,IJU,IKU))
ALLOCATE(XCURRENT_RTKES(IIU,IJU,IKU))
ALLOCATE(XCURRENT_RRS (IIU,IJU,IKU,NRR))
+ALLOCATE(XCURRENT_RSVS (IIU,IJU,IKU,NSV))
ALLOCATE(XCURRENT_RTHLS(IIU,IJU,IKU))
ALLOCATE(XCURRENT_RRTS (IIU,IJU,IKU))
!
+XCURRENT_RUS =XRUS
+XCURRENT_RVS =XRVS
+XCURRENT_RWS =XRWS
XCURRENT_RTHS =XRTHS
XCURRENT_RTKES=XRTKES
XCURRENT_RRS =XRRS
+XCURRENT_RSVS =XRSVS
CALL THL_RT_FROM_TH_R(LUSERV, LUSERC, LUSERR, &
LUSERI, LUSERS, LUSERG, LUSERH, &
XCURRENT_L_O_EXN_CP, &
diff --git a/src/MNH/lesn.f90 b/src/MNH/lesn.f90
index d7c240bcf..aca09170f 100644
--- a/src/MNH/lesn.f90
+++ b/src/MNH/lesn.f90
@@ -1162,9 +1162,13 @@ DEALLOCATE(XSV_ANOM )
DEALLOCATE(XCURRENT_L_O_EXN_CP)
DEALLOCATE(XCURRENT_RHODJ )
!
+DEALLOCATE(XCURRENT_RUS )
+DEALLOCATE(XCURRENT_RVS )
+DEALLOCATE(XCURRENT_RWS )
DEALLOCATE(XCURRENT_RTHS )
DEALLOCATE(XCURRENT_RTKES)
DEALLOCATE(XCURRENT_RRS )
+DEALLOCATE(XCURRENT_RSVS )
DEALLOCATE(XCURRENT_RTHLS)
DEALLOCATE(XCURRENT_RRTS )
diff --git a/src/MNH/modd_les_budget.f90 b/src/MNH/modd_les_budget.f90
index 7e6f60f0b..062eb3552 100644
--- a/src/MNH/modd_les_budget.f90
+++ b/src/MNH/modd_les_budget.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2002-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2019 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.
@@ -69,9 +69,13 @@ INTEGER :: NCURRENT_RR
!
!* source of U, V, W, Th, R* from advection term
!
+REAL, DIMENSION(:,:,:), ALLOCATABLE :: XCURRENT_RUS
+REAL, DIMENSION(:,:,:), ALLOCATABLE :: XCURRENT_RVS
+REAL, DIMENSION(:,:,:), ALLOCATABLE :: XCURRENT_RWS
REAL, DIMENSION(:,:,:), ALLOCATABLE :: XCURRENT_RTHS
REAL, DIMENSION(:,:,:), ALLOCATABLE :: XCURRENT_RTKES
REAL, DIMENSION(:,:,:,:), ALLOCATABLE :: XCURRENT_RRS
+REAL, DIMENSION(:,:,:,:), ALLOCATABLE :: XCURRENT_RSVS
REAL, DIMENSION(:,:,:), ALLOCATABLE :: XCURRENT_RTHLS
REAL, DIMENSION(:,:,:), ALLOCATABLE :: XCURRENT_RRTS
!
--
GitLab