From 552d261aa55709bb3a540f4d5a2e59c5a2b4d988 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 6 Mar 2020 10:04:03 +0100
Subject: [PATCH] Philippe 06/03/2020: budgets: comment calls to budget in
unused source files (dead code)
---
src/MNH/advecmet.f90 | 56 ++++++++++-----------
src/MNH/advecmet_4th.f90 | 56 ++++++++++-----------
src/MNH/advecscalar.f90 | 8 +--
src/MNH/advecscalar_4th.f90 | 8 +--
src/MNH/advecuvw.f90 | 20 ++++----
src/MNH/fct_met.f90 | 98 ++++++++++++++++++-------------------
src/MNH/fct_scalar.f90 | 14 +++---
src/MNH/mpdata.f90 | 56 ++++++++++-----------
src/MNH/mpdata_scalar.f90 | 18 +++----
9 files changed, 167 insertions(+), 167 deletions(-)
diff --git a/src/MNH/advecmet.f90 b/src/MNH/advecmet.f90
index d375b1082..527febf15 100644
--- a/src/MNH/advecmet.f90
+++ b/src/MNH/advecmet.f90
@@ -134,7 +134,7 @@ USE MODD_BUDGET
USE MODD_GRID_n
!
USE MODI_SHUMAN
-USE MODI_BUDGET
+!USE MODI_BUDGET
!
IMPLICIT NONE
!
@@ -169,15 +169,15 @@ IKU=SIZE(XZHAT)
! Thermodynamical variable
PRTHS(:,:,:) = PRTHS(:,:,:) &
-DXF( PRUCT(:,:,:) * MXM (PTHT(:,:,:)) )
-IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVX_BU_RTH')
+!IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVX_BU_RTH')
!
PRTHS(:,:,:) = PRTHS(:,:,:) &
-DYF( PRVCT(:,:,:) * MYM (PTHT(:,:,:)) )
-IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVY_BU_RTH')
+!IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVY_BU_RTH')
!
PRTHS(:,:,:) = PRTHS(:,:,:) &
-DZF(1,IKU,1, PRWCT(:,:,:) * MZM (1,IKU,1,PTHT(:,:,:)) )
-IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVZ_BU_RTH')
+!IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVZ_BU_RTH')
!
! Case with KRR moist variables
DO JRR=1,KRR
@@ -185,53 +185,53 @@ DO JRR=1,KRR
-DXF( PRUCT(:,:,:) * MXM (PRT(:,:,:,JRR)) )
END DO
!
-IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVX_BU_RRV')
-IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVX_BU_RRC')
-IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVX_BU_RRR')
-IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVX_BU_RRI')
-IF (LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVX_BU_RRS')
-IF (LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVX_BU_RRG')
-IF (LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVX_BU_RRH')
+!IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVX_BU_RRV')
+!IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVX_BU_RRC')
+!IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVX_BU_RRR')
+!IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVX_BU_RRI')
+!IF (LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVX_BU_RRS')
+!IF (LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVX_BU_RRG')
+!IF (LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVX_BU_RRH')
!
DO JRR=1,KRR
PRRS(:,:,:,JRR) = PRRS(:,:,:,JRR) &
-DYF( PRVCT(:,:,:) * MYM (PRT(:,:,:,JRR)) )
END DO
!
-IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVY_BU_RRV')
-IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVY_BU_RRC')
-IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVY_BU_RRR')
-IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVY_BU_RRI')
-IF (LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVY_BU_RRS')
-IF (LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVY_BU_RRG')
-IF (LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVY_BU_RRH')
+!IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVY_BU_RRV')
+!IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVY_BU_RRC')
+!IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVY_BU_RRR')
+!IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVY_BU_RRI')
+!IF (LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVY_BU_RRS')
+!IF (LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVY_BU_RRG')
+!IF (LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVY_BU_RRH')
!
DO JRR=1,KRR
PRRS(:,:,:,JRR) = PRRS(:,:,:,JRR) &
-DZF(1,IKU,1, PRWCT(:,:,:) * MZM (1,IKU,1,PRT(:,:,:,JRR)) )
END DO
!
-IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVZ_BU_RRV')
-IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVZ_BU_RRC')
-IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVZ_BU_RRR')
-IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVZ_BU_RRI')
-IF (LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVZ_BU_RRS')
-IF (LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVZ_BU_RRG')
-IF (LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVZ_BU_RRH')
+!IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVZ_BU_RRV')
+!IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVZ_BU_RRC')
+!IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVZ_BU_RRR')
+!IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVZ_BU_RRI')
+!IF (LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVZ_BU_RRS')
+!IF (LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVZ_BU_RRG')
+!IF (LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVZ_BU_RRH')
!
! TKE variable
IF (SIZE(PTKET,1) /= 0) THEN
PRTKES(:,:,:) = PRTKES(:,:,:) &
-DXF( PRUCT(:,:,:) * MXM (PTKET(:,:,:)) )
- IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVX_BU_RTKE')
+! IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVX_BU_RTKE')
!
PRTKES(:,:,:) = PRTKES(:,:,:) &
-DYF( PRVCT(:,:,:) * MYM (PTKET(:,:,:)) )
- IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVY_BU_RTKE')
+! IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVY_BU_RTKE')
!
PRTKES(:,:,:) = PRTKES(:,:,:) &
-DZF(1,IKU,1, PRWCT(:,:,:) * MZM (1,IKU,1,PTKET(:,:,:)) )
- IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVZ_BU_RTKE')
+! IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVZ_BU_RTKE')
END IF
!
!
diff --git a/src/MNH/advecmet_4th.f90 b/src/MNH/advecmet_4th.f90
index 61c463f30..57ab588ad 100644
--- a/src/MNH/advecmet_4th.f90
+++ b/src/MNH/advecmet_4th.f90
@@ -162,7 +162,7 @@ USE MODD_BUDGET
USE MODD_ARGSLIST_ll, ONLY : HALO2LIST_ll
!
USE MODI_SHUMAN
-USE MODI_BUDGET
+!USE MODI_BUDGET
!
! incorporate ADVEC_4TH_ORDER_ALG, MZF4 and MZM4
USE MODI_ADVEC_4TH_ORDER_AUX
@@ -232,15 +232,15 @@ IGRID = 1
!
PRTHS(:,:,:) = PRTHS(:,:,:) &
-DXF( PRUCT(:,:,:) * ZMEANX(:,:,:) )
-IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVX_BU_RTH')
+!IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVX_BU_RTH')
!
PRTHS(:,:,:) = PRTHS(:,:,:) &
-DYF( PRVCT(:,:,:) * ZMEANY(:,:,:) )
-IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVY_BU_RTH')
+!IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVY_BU_RTH')
!
PRTHS(:,:,:) = PRTHS(:,:,:) &
-DZF(1,IKU,1, PRWCT(:,:,:) * MZM4(PTHT(:,:,:)) )
-IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVZ_BU_RTH')
+!IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVZ_BU_RTH')
!
! Turbulence variables
!
@@ -255,15 +255,15 @@ IF ( GTKEALLOC ) THEN
!
PRTKES(:,:,:) = PRTKES(:,:,:) &
-DXF( PRUCT(:,:,:) * ZMEANX(:,:,:) )
- IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVX_BU_RTKE')
+! IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVX_BU_RTKE')
!
PRTKES(:,:,:) = PRTKES(:,:,:) &
-DYF( PRVCT(:,:,:) * ZMEANY(:,:,:) )
- IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVY_BU_RTKE')
+! IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVY_BU_RTKE')
!
PRTKES(:,:,:) = PRTKES(:,:,:) &
-DZF(1,IKU,1, PRWCT(:,:,:) * MZM4(PTKET(:,:,:)) )
- IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVZ_BU_RTKE')
+! IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVZ_BU_RTKE')
ENDIF
!
!
@@ -280,33 +280,33 @@ DO JRR=1, KRR
!
PRRS(:,:,:,JRR) = PRRS(:,:,:,JRR) &
-DXF( PRUCT(:,:,:) * ZMEANX(:,:,:) )
- IF (JRR==1 .AND. LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVX_BU_RRV')
- IF (JRR==2 .AND. LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVX_BU_RRC')
- IF (JRR==3 .AND. LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVX_BU_RRR')
- IF (JRR==4 .AND. LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVX_BU_RRI')
- IF (JRR==5 .AND. LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVX_BU_RRS')
- IF (JRR==6 .AND. LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVX_BU_RRG')
- IF (JRR==7 .AND. LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVX_BU_RRH')
+! IF (JRR==1 .AND. LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVX_BU_RRV')
+! IF (JRR==2 .AND. LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVX_BU_RRC')
+! IF (JRR==3 .AND. LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVX_BU_RRR')
+! IF (JRR==4 .AND. LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVX_BU_RRI')
+! IF (JRR==5 .AND. LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVX_BU_RRS')
+! IF (JRR==6 .AND. LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVX_BU_RRG')
+! IF (JRR==7 .AND. LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVX_BU_RRH')
!
PRRS(:,:,:,JRR) = PRRS(:,:,:,JRR) &
-DYF( PRVCT(:,:,:) * ZMEANY(:,:,:) )
- IF (JRR==1 .AND. LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVY_BU_RRV')
- IF (JRR==2 .AND. LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVY_BU_RRC')
- IF (JRR==3 .AND. LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVY_BU_RRR')
- IF (JRR==4 .AND. LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVY_BU_RRI')
- IF (JRR==5 .AND. LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVY_BU_RRS')
- IF (JRR==6 .AND. LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVY_BU_RRG')
- IF (JRR==7 .AND. LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVY_BU_RRH')
+! IF (JRR==1 .AND. LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVY_BU_RRV')
+! IF (JRR==2 .AND. LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVY_BU_RRC')
+! IF (JRR==3 .AND. LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVY_BU_RRR')
+! IF (JRR==4 .AND. LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVY_BU_RRI')
+! IF (JRR==5 .AND. LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVY_BU_RRS')
+! IF (JRR==6 .AND. LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVY_BU_RRG')
+! IF (JRR==7 .AND. LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVY_BU_RRH')
!
PRRS(:,:,:,JRR) = PRRS(:,:,:,JRR) &
-DZF(1,IKU,1, PRWCT(:,:,:) * MZM4(PRT(:,:,:,JRR)) )
- IF (JRR==1 .AND. LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVZ_BU_RRV')
- IF (JRR==2 .AND. LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVZ_BU_RRC')
- IF (JRR==3 .AND. LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVZ_BU_RRR')
- IF (JRR==4 .AND. LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVZ_BU_RRI')
- IF (JRR==5 .AND. LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVZ_BU_RRS')
- IF (JRR==6 .AND. LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVZ_BU_RRG')
- IF (JRR==7 .AND. LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVZ_BU_RRH')
+! IF (JRR==1 .AND. LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1),NBUDGET_RV,'ADVZ_BU_RRV')
+! IF (JRR==2 .AND. LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),NBUDGET_RC,'ADVZ_BU_RRC')
+! IF (JRR==3 .AND. LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3),NBUDGET_RR,'ADVZ_BU_RRR')
+! IF (JRR==4 .AND. LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4),NBUDGET_RI,'ADVZ_BU_RRI')
+! IF (JRR==5 .AND. LBUDGET_RS) CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVZ_BU_RRS')
+! IF (JRR==6 .AND. LBUDGET_RG) CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVZ_BU_RRG')
+! IF (JRR==7 .AND. LBUDGET_RH) CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVZ_BU_RRH')
ENDDO
!
!
diff --git a/src/MNH/advecscalar.f90 b/src/MNH/advecscalar.f90
index 4fd1e47a4..0efc3342f 100644
--- a/src/MNH/advecscalar.f90
+++ b/src/MNH/advecscalar.f90
@@ -103,7 +103,7 @@ USE MODD_BUDGET
USE MODD_GRID_n
!
USE MODI_SHUMAN
-USE MODI_BUDGET
+!USE MODI_BUDGET
!
IMPLICIT NONE
!
@@ -141,7 +141,7 @@ DO JSV=1,KSV
END DO
IF (LBUDGET_SV) THEN
DO JSV=1,KSV
- CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVX_BU_RSV')
+! CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVX_BU_RSV')
END DO
END IF
!
@@ -151,7 +151,7 @@ DO JSV=1,KSV
END DO
IF (LBUDGET_SV) THEN
DO JSV=1,KSV
- CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVY_BU_RSV')
+! CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVY_BU_RSV')
END DO
END IF
!
@@ -161,7 +161,7 @@ DO JSV=1,KSV
END DO
IF (LBUDGET_SV) THEN
DO JSV=1,KSV
- CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVZ_BU_RSV')
+! CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVZ_BU_RSV')
END DO
END IF
!
diff --git a/src/MNH/advecscalar_4th.f90 b/src/MNH/advecscalar_4th.f90
index d41632edb..2e0821a6b 100644
--- a/src/MNH/advecscalar_4th.f90
+++ b/src/MNH/advecscalar_4th.f90
@@ -121,7 +121,7 @@ USE MODD_BUDGET
USE MODD_ARGSLIST_ll, ONLY : HALO2LIST_ll
!
USE MODI_SHUMAN
-USE MODI_BUDGET
+!USE MODI_BUDGET
!
! incorporate ADVEC_4TH_ORDER_ALG, MZF4 and MZM4
USE MODI_ADVEC_4TH_ORDER_AUX
@@ -188,15 +188,15 @@ DO JSV=1,KSV
!
PRSVS(:,:,:,JSV) = PRSVS(:,:,:,JSV) &
-DXF( PRUCT(:,:,:) * ZMEANX(:,:,:) )
- IF (LBUDGET_SV) CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVX_BU_RSV')
+! IF (LBUDGET_SV) CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVX_BU_RSV')
!
PRSVS(:,:,:,JSV) = PRSVS(:,:,:,JSV) &
-DYF( PRVCT(:,:,:) * ZMEANY(:,:,:) )
- IF (LBUDGET_SV) CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVY_BU_RSV')
+! IF (LBUDGET_SV) CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVY_BU_RSV')
!
PRSVS(:,:,:,JSV) = PRSVS(:,:,:,JSV) &
-DZF(1,IKU,1, PRWCT(:,:,:) * MZM4(PSVT(:,:,:,JSV)) )
- IF (LBUDGET_SV) CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVZ_BU_RSV')
+! IF (LBUDGET_SV) CALL BUDGET (PRSVS(:,:,:,JSV),JSV+NBUDGET_SV1-1,'ADVZ_BU_RSV')
ENDDO
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/advecuvw.f90 b/src/MNH/advecuvw.f90
index c0488bbda..3ad38e2ec 100644
--- a/src/MNH/advecuvw.f90
+++ b/src/MNH/advecuvw.f90
@@ -115,7 +115,7 @@ USE MODD_BUDGET
USE MODD_GRID_n
!
USE MODI_SHUMAN
-USE MODI_BUDGET
+!USE MODI_BUDGET
!
IMPLICIT NONE
!
@@ -141,41 +141,41 @@ IKU=SIZE(XZHAT)
!
PRUS(:,:,:) = PRUS(:,:,:) &
-DXM( MXF(PRUCT(:,:,:))*MXF(PUT(:,:,:)) )
-IF (LBUDGET_U) CALL BUDGET (PRUS,NBUDGET_U,'ADVX_BU_RU')
+!IF (LBUDGET_U) CALL BUDGET (PRUS,NBUDGET_U,'ADVX_BU_RU')
!
PRUS(:,:,:) = PRUS(:,:,:) &
-DYF( MXM(PRVCT(:,:,:))*MYM(PUT(:,:,:)) )
-IF (LBUDGET_U) CALL BUDGET (PRUS,NBUDGET_U,'ADVY_BU_RU')
+!IF (LBUDGET_U) CALL BUDGET (PRUS,NBUDGET_U,'ADVY_BU_RU')
!
PRUS(:,:,:) = PRUS(:,:,:) &
-DZF(1,IKU,1, MXM(PRWCT(:,:,:))*MZM(1,IKU,1,PUT(:,:,:)) )
-IF (LBUDGET_U) CALL BUDGET (PRUS,NBUDGET_U,'ADVZ_BU_RU')
+!IF (LBUDGET_U) CALL BUDGET (PRUS,NBUDGET_U,'ADVZ_BU_RU')
!
!
PRVS(:,:,:) = PRVS(:,:,:) &
-DXF( MYM(PRUCT(:,:,:))*MXM(PVT(:,:,:)) )
-IF (LBUDGET_V) CALL BUDGET (PRVS,NBUDGET_V,'ADVX_BU_RV')
+!IF (LBUDGET_V) CALL BUDGET (PRVS,NBUDGET_V,'ADVX_BU_RV')
!
PRVS(:,:,:) = PRVS(:,:,:) &
-DYM( MYF(PRVCT(:,:,:))*MYF(PVT(:,:,:)) )
-IF (LBUDGET_V) CALL BUDGET (PRVS,NBUDGET_V,'ADVY_BU_RV')
+!IF (LBUDGET_V) CALL BUDGET (PRVS,NBUDGET_V,'ADVY_BU_RV')
!
PRVS(:,:,:) = PRVS(:,:,:) &
-DZF(1,IKU,1, MYM(PRWCT(:,:,:))*MZM(1,IKU,1,PVT(:,:,:)) )
-IF (LBUDGET_V) CALL BUDGET (PRVS,NBUDGET_V,'ADVZ_BU_RV')
+!IF (LBUDGET_V) CALL BUDGET (PRVS,NBUDGET_V,'ADVZ_BU_RV')
!
!
PRWS(:,:,:) = PRWS(:,:,:) &
-DXF( MZM(1,IKU,1,PRUCT(:,:,:))*MXM(PWT(:,:,:)) )
-IF (LBUDGET_W) CALL BUDGET (PRWS,NBUDGET_W,'ADVX_BU_RW')
+!IF (LBUDGET_W) CALL BUDGET (PRWS,NBUDGET_W,'ADVX_BU_RW')
!
PRWS(:,:,:) = PRWS(:,:,:) &
-DYF( MZM(1,IKU,1,PRVCT(:,:,:))*MYM(PWT(:,:,:)) )
-IF (LBUDGET_W) CALL BUDGET (PRWS,NBUDGET_W,'ADVY_BU_RW')
+!IF (LBUDGET_W) CALL BUDGET (PRWS,NBUDGET_W,'ADVY_BU_RW')
!
PRWS(:,:,:) = PRWS(:,:,:) &
-DZM(1,IKU,1, MZF(1,IKU,1,PRWCT(:,:,:))*MZF(1,IKU,1,PWT(:,:,:)) )
-IF (LBUDGET_W) CALL BUDGET (PRWS,NBUDGET_W,'ADVZ_BU_RW')
+!IF (LBUDGET_W) CALL BUDGET (PRWS,NBUDGET_W,'ADVZ_BU_RW')
!
!-------------------------------------------------------------------------------
!
diff --git a/src/MNH/fct_met.f90 b/src/MNH/fct_met.f90
index 70ca6911e..3597b264c 100644
--- a/src/MNH/fct_met.f90
+++ b/src/MNH/fct_met.f90
@@ -106,7 +106,7 @@ END MODULE MODI_FCT_MET
USE MODD_BUDGET
USE MODI_SHUMAN
USE MODI_DFLUX_CORR
-USE MODI_BUDGET
+!USE MODI_BUDGET
USE MODD_GRID_n
!
IMPLICIT NONE
@@ -163,15 +163,15 @@ IKU=SIZE(XZHAT)
!
PRTHS(:,:,:) = PRTHS(:,:,:) &
- DXF(PRUCT(:,:,:)*MXM (PTHT(:,:,:)))
- IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVX_BU_RTH')
+! IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVX_BU_RTH')
!
PRTHS(:,:,:) = PRTHS(:,:,:) &
- DYF(PRVCT(:,:,:)*MYM (PTHT(:,:,:)))
- IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVY_BU_RTH')
+! IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVY_BU_RTH')
!
PRTHS(:,:,:) = PRTHS(:,:,:) &
- DZF(1,IKU,1,PRWCT(:,:,:)*MZM (1,IKU,1,PTHT(:,:,:)))
- IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVZ_BU_RTH')
+! IF (LBUDGET_TH) CALL BUDGET (PRTHS,NBUDGET_TH,'ADVZ_BU_RTH')
!
!* 1.2 No condensation case: Vapor ---> advected by a FCT scheme
!
@@ -184,16 +184,16 @@ IKU=SIZE(XZHAT)
ZFX(:,:,:), ZFY(:,:,:), ZFZ(:,:,:) )
!
PRRS(:,:,:,1) = PRRS(:,:,:,1) - DXF(ZFX(:,:,:))
- IF (LBUDGET_RV) &
- CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVX_BU_RRV')
+! IF (LBUDGET_RV) &
+! CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVX_BU_RRV')
!
PRRS(:,:,:,1) = PRRS(:,:,:,1) - DYF(ZFY(:,:,:))
- IF (LBUDGET_RV) &
- CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVY_BU_RRV')
+! IF (LBUDGET_RV) &
+! CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVY_BU_RRV')
!
PRRS(:,:,:,1) = PRRS(:,:,:,1) - DZF(1,IKU,1,ZFZ(:,:,:))
- IF (LBUDGET_RV) &
- CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVZ_BU_RRV')
+! IF (LBUDGET_RV) &
+! CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVZ_BU_RRV')
END IF
!
!* 1.3 No ice case: rv+rc ---> advected by the FCT scheme
@@ -215,18 +215,18 @@ IKU=SIZE(XZHAT)
!
PRRS(:,:,:,1) = PRRS(:,:,:,1) - DXF(ZRTFX(:,:,:))
PRRS(:,:,:,2) = PRRS(:,:,:,2) - DXF( ZFX(:,:,:))
- IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVX_BU_RRV')
- IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVX_BU_RRC')
+! IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVX_BU_RRV')
+! IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVX_BU_RRC')
!
PRRS(:,:,:,1) = PRRS(:,:,:,1) - DYF(ZRTFY(:,:,:))
PRRS(:,:,:,2) = PRRS(:,:,:,2) - DYF( ZFY(:,:,:))
- IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVY_BU_RRV')
- IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVY_BU_RRC')
+! IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVY_BU_RRV')
+! IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVY_BU_RRC')
!
PRRS(:,:,:,1) = PRRS(:,:,:,1) - DZF(1,IKU,1,ZRTFZ(:,:,:))
PRRS(:,:,:,2) = PRRS(:,:,:,2) - DZF(1,IKU,1, ZFZ(:,:,:))
- IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVZ_BU_RRV')
- IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVZ_BU_RRC')
+! IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVZ_BU_RRV')
+! IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVZ_BU_RRC')
!
END IF
!
@@ -250,13 +250,13 @@ IKU=SIZE(XZHAT)
ZRTFZ(:,:,:) = ZRTFZ(:,:,:) - ZFZ(:,:,:) !
!
PRRS(:,:,:,2) = PRRS(:,:,:,2) - DXF( ZFX(:,:,:))
- IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVX_BU_RRC')
+! IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVX_BU_RRC')
!
PRRS(:,:,:,2) = PRRS(:,:,:,2) - DYF( ZFY(:,:,:))
- IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVY_BU_RRC')
+! IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVY_BU_RRC')
!
PRRS(:,:,:,2) = PRRS(:,:,:,2) - DZF(1,IKU,1, ZFZ(:,:,:))
- IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVZ_BU_RRC')
+! IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2), NBUDGET_RC,'ADVZ_BU_RRC')
!
!
ZFX(:,:,:) = PRUCT(:,:,:) * MXM (PRT(:,:,:,4)) !
@@ -269,18 +269,18 @@ IKU=SIZE(XZHAT)
!
PRRS(:,:,:,1) = PRRS(:,:,:,1) - DXF(ZRTFX(:,:,:))
PRRS(:,:,:,4) = PRRS(:,:,:,4) - DXF( ZFX(:,:,:))
- IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVX_BU_RRV')
- IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4), NBUDGET_RI,'ADVX_BU_RRI')
+! IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVX_BU_RRV')
+! IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4), NBUDGET_RI,'ADVX_BU_RRI')
!
PRRS(:,:,:,1) = PRRS(:,:,:,1) - DYF(ZRTFY(:,:,:))
PRRS(:,:,:,4) = PRRS(:,:,:,4) - DYF( ZFY(:,:,:))
- IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVY_BU_RRV')
- IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4), NBUDGET_RI,'ADVY_BU_RRI')
+! IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVY_BU_RRV')
+! IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4), NBUDGET_RI,'ADVY_BU_RRI')
!
PRRS(:,:,:,1) = PRRS(:,:,:,1) - DZF(1,IKU,1,ZRTFZ(:,:,:))
PRRS(:,:,:,4) = PRRS(:,:,:,4) - DZF(1,IKU,1, ZFZ(:,:,:))
- IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVZ_BU_RRV')
- IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4), NBUDGET_RI,'ADVZ_BU_RRI')
+! IF (LBUDGET_RV) CALL BUDGET (PRRS(:,:,:,1), NBUDGET_RV,'ADVZ_BU_RRV')
+! IF (LBUDGET_RI) CALL BUDGET (PRRS(:,:,:,4), NBUDGET_RI,'ADVZ_BU_RRI')
!
END IF
!
@@ -293,13 +293,13 @@ IKU=SIZE(XZHAT)
ZFX(:,:,:), ZFY(:,:,:), ZFZ(:,:,:) )
!
PRRS(:,:,:,3) = PRRS(:,:,:,3) - DXF( ZFX(:,:,:))
- IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3), NBUDGET_RR,'ADVX_BU_RRR')
+! IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3), NBUDGET_RR,'ADVX_BU_RRR')
!
PRRS(:,:,:,3) = PRRS(:,:,:,3) - DYF( ZFY(:,:,:))
- IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3), NBUDGET_RR,'ADVY_BU_RRR')
+! IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3), NBUDGET_RR,'ADVY_BU_RRR')
!
PRRS(:,:,:,3) = PRRS(:,:,:,3) - DZF(1,IKU,1, ZFZ(:,:,:))
- IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3), NBUDGET_RR,'ADVZ_BU_RRR')
+! IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:,3), NBUDGET_RR,'ADVZ_BU_RRR')
!
END IF
!
@@ -312,28 +312,28 @@ IKU=SIZE(XZHAT)
ZFX(:,:,:), ZFY(:,:,:), ZFZ(:,:,:) )
!
PRRS(:,:,:,JRR) = PRRS(:,:,:,JRR) - DXF(ZFX(:,:,:))
- IF (JRR==5.AND.LBUDGET_RS) &
- CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVX_BU_RRS')
- IF (JRR==6.AND.LBUDGET_RG) &
- CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVX_BU_RRG')
- IF (JRR==7.AND.LBUDGET_RH) &
- CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVX_BU_RRH')
+! IF (JRR==5.AND.LBUDGET_RS) &
+! CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVX_BU_RRS')
+! IF (JRR==6.AND.LBUDGET_RG) &
+! CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVX_BU_RRG')
+! IF (JRR==7.AND.LBUDGET_RH) &
+! CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVX_BU_RRH')
!
PRRS(:,:,:,JRR) = PRRS(:,:,:,JRR) - DYF(ZFY(:,:,:))
- IF (JRR==5.AND.LBUDGET_RS) &
- CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVY_BU_RRS')
- IF (JRR==6.AND.LBUDGET_RG) &
- CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVY_BU_RRG')
- IF (JRR==7.AND.LBUDGET_RH) &
- CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVY_BU_RRH')
+! IF (JRR==5.AND.LBUDGET_RS) &
+! CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVY_BU_RRS')
+! IF (JRR==6.AND.LBUDGET_RG) &
+! CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVY_BU_RRG')
+! IF (JRR==7.AND.LBUDGET_RH) &
+! CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVY_BU_RRH')
!
PRRS(:,:,:,JRR) = PRRS(:,:,:,JRR) - DZF(1,IKU,1,ZFZ(:,:,:))
- IF (JRR==5.AND.LBUDGET_RS) &
- CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVZ_BU_RRS')
- IF (JRR==6.AND.LBUDGET_RG) &
- CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVZ_BU_RRG')
- IF (JRR==7.AND.LBUDGET_RH) &
- CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVZ_BU_RRH')
+ ! IF (JRR==5.AND.LBUDGET_RS) &
+ ! CALL BUDGET (PRRS(:,:,:,5),NBUDGET_RS,'ADVZ_BU_RRS')
+ ! IF (JRR==6.AND.LBUDGET_RG) &
+ ! CALL BUDGET (PRRS(:,:,:,6),NBUDGET_RG,'ADVZ_BU_RRG')
+ ! IF (JRR==7.AND.LBUDGET_RH) &
+ ! CALL BUDGET (PRRS(:,:,:,7),NBUDGET_RH,'ADVZ_BU_RRH')
!
END DO
!
@@ -349,13 +349,13 @@ IKU=SIZE(XZHAT)
ZFX(:,:,:), ZFY(:,:,:), ZFZ(:,:,:) )
!
PRTKES(:,:,:) = PRTKES(:,:,:) - DXF(ZFX(:,:,:))
- IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVX_BU_RTKE')
+! IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVX_BU_RTKE')
!
PRTKES(:,:,:) = PRTKES(:,:,:) - DYF(ZFY(:,:,:))
- IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVY_BU_RTKE')
+! IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVY_BU_RTKE')
!
PRTKES(:,:,:) = PRTKES(:,:,:) - DZF(1,IKU,1,ZFZ(:,:,:))
- IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVZ_BU_RTKE')
+! IF (LBUDGET_TKE) CALL BUDGET (PRTKES,NBUDGET_TKE,'ADVZ_BU_RTKE')
!
END IF
!
diff --git a/src/MNH/fct_scalar.f90 b/src/MNH/fct_scalar.f90
index 9af746bb5..f3641c63b 100644
--- a/src/MNH/fct_scalar.f90
+++ b/src/MNH/fct_scalar.f90
@@ -102,7 +102,7 @@ USE MODD_NSV, ONLY : XSVMIN
USE MODD_GRID_n
USE MODI_SHUMAN
USE MODI_DFLUX_CORR
-USE MODI_BUDGET
+!USE MODI_BUDGET
!
IMPLICIT NONE
!
@@ -151,16 +151,16 @@ IKU=SIZE(XZHAT)
ZFX(:,:,:),ZFY(:,:,:),ZFZ(:,:,:) )
!
PRSVS(:,:,:,JSV) = PRSVS(:,:,:,JSV) - DXF(ZFX(:,:,:))
- IF (LBUDGET_SV) &
- CALL BUDGET (PRSVS(:,:,:,JSV),NBUDGET_SV1-1+JSV,'ADVX_BU_RSV')
+! IF (LBUDGET_SV) &
+! CALL BUDGET (PRSVS(:,:,:,JSV),NBUDGET_SV1-1+JSV,'ADVX_BU_RSV')
!
PRSVS(:,:,:,JSV) = PRSVS(:,:,:,JSV) - DYF(ZFY(:,:,:))
- IF (LBUDGET_SV) &
- CALL BUDGET (PRSVS(:,:,:,JSV),NBUDGET_SV1-1+JSV,'ADVY_BU_RSV')
+! IF (LBUDGET_SV) &
+! CALL BUDGET (PRSVS(:,:,:,JSV),NBUDGET_SV1-1+JSV,'ADVY_BU_RSV')
!
PRSVS(:,:,:,JSV) = PRSVS(:,:,:,JSV) - DZF(1,IKU,1,ZFZ(:,:,:))
- IF (LBUDGET_SV) &
- CALL BUDGET (PRSVS(:,:,:,JSV),NBUDGET_SV1-1+JSV,'ADVZ_BU_RSV')
+! IF (LBUDGET_SV) &
+! CALL BUDGET (PRSVS(:,:,:,JSV),NBUDGET_SV1-1+JSV,'ADVZ_BU_RSV')
END DO
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/mpdata.f90 b/src/MNH/mpdata.f90
index a0e2c921d..1729c968e 100644
--- a/src/MNH/mpdata.f90
+++ b/src/MNH/mpdata.f90
@@ -113,7 +113,7 @@ USE MODD_PARAMETERS
USE MODI_SHUMAN
USE MODI_FLUX
USE MODI_ANTI_DIFF
-USE MODI_BUDGET
+!USE MODI_BUDGET
!
IMPLICIT NONE
!
@@ -269,14 +269,14 @@ irx(7) = NBUDGET_RH
!
CALL CLEANLIST_ll(TZFIELDS_ll)
!
- IF (LBUDGET_TH) THEN
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVU(:,:,:)
- CALL BUDGET (ZRVARS,NBUDGET_TH,'ADVX_BU_RTH')
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVV(:,:,:)
- CALL BUDGET (ZRVARS,NBUDGET_TH,'ADVY_BU_RTH')
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVW(:,:,:)
- CALL BUDGET (ZRVARS,NBUDGET_TH,'ADVZ_BU_RTH')
- END IF
+! IF (LBUDGET_TH) THEN
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVU(:,:,:)
+! CALL BUDGET (ZRVARS,NBUDGET_TH,'ADVX_BU_RTH')
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVV(:,:,:)
+! CALL BUDGET (ZRVARS,NBUDGET_TH,'ADVY_BU_RTH')
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVW(:,:,:)
+! CALL BUDGET (ZRVARS,NBUDGET_TH,'ADVZ_BU_RTH')
+! END IF
!
!-------------------------------------------------------------------------------
!
@@ -332,17 +332,17 @@ irx(7) = NBUDGET_RH
!
CALL CLEANLIST_ll(TZFIELDS_ll)
!
- IF (LBUDGET_R(JRR)) THEN
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVU(:,:,:)
- YBURX = 'ADVX_BU_'//YRX(JRR)
- CALL BUDGET (ZRVARS(:,:,:), irx(jrr ), YBURX)
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVV(:,:,:)
- YBURX = 'ADVY_BU_'//YRX(JRR)
- CALL BUDGET (ZRVARS(:,:,:), irx(jrr ), YBURX)
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVW(:,:,:)
- YBURX = 'ADVZ_BU_'//YRX(JRR)
- CALL BUDGET (ZRVARS(:,:,:), irx(jrr ), YBURX)
- END IF
+! IF (LBUDGET_R(JRR)) THEN
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVU(:,:,:)
+! YBURX = 'ADVX_BU_'//YRX(JRR)
+! CALL BUDGET (ZRVARS(:,:,:), irx(jrr ), YBURX)
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVV(:,:,:)
+! YBURX = 'ADVY_BU_'//YRX(JRR)
+! CALL BUDGET (ZRVARS(:,:,:), irx(jrr ), YBURX)
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVW(:,:,:)
+! YBURX = 'ADVZ_BU_'//YRX(JRR)
+! CALL BUDGET (ZRVARS(:,:,:), irx(jrr ), YBURX)
+! END IF
END DO
!
!
@@ -399,14 +399,14 @@ irx(7) = NBUDGET_RH
!
CALL CLEANLIST_ll(TZFIELDS_ll)
!
- IF (LBUDGET_TKE) THEN
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVU(:,:,:)
- CALL BUDGET (ZRVARS,NBUDGET_TKE,'ADVX_BU_RTKE')
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVV(:,:,:)
- CALL BUDGET (ZRVARS,NBUDGET_TKE,'ADVY_BU_RTKE')
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVW(:,:,:)
- CALL BUDGET (ZRVARS,NBUDGET_TKE,'ADVZ_BU_RTKE')
- END IF
+! IF (LBUDGET_TKE) THEN
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVU(:,:,:)
+! CALL BUDGET (ZRVARS,NBUDGET_TKE,'ADVX_BU_RTKE')
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVV(:,:,:)
+! CALL BUDGET (ZRVARS,NBUDGET_TKE,'ADVY_BU_RTKE')
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVW(:,:,:)
+! CALL BUDGET (ZRVARS,NBUDGET_TKE,'ADVZ_BU_RTKE')
+! END IF
END IF
!
!-------------------------------------------------------------------------------
diff --git a/src/MNH/mpdata_scalar.f90 b/src/MNH/mpdata_scalar.f90
index 6214a8c3e..d75869bfe 100644
--- a/src/MNH/mpdata_scalar.f90
+++ b/src/MNH/mpdata_scalar.f90
@@ -111,7 +111,7 @@ USE MODD_NSV, ONLY : NSV_DSTBEG, NSV_DSTEND, NSV_AERBEG, NSV_AEREND,&
USE MODI_SHUMAN
USE MODI_FLUX
USE MODI_ANTI_DIFF
-USE MODI_BUDGET
+!USE MODI_BUDGET
!
IMPLICIT NONE
!
@@ -234,14 +234,14 @@ IKU=SIZE(PSVM,3)
!
CALL CLEANLIST_ll(TZFIELDS_ll)
!
- IF (LBUDGET_SV) THEN
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVU(:,:,:)
- CALL BUDGET (ZRVARS,NBUDGET_SV1-1+JSV,'ADVX_BU_RSV')
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVV(:,:,:)
- CALL BUDGET (ZRVARS,NBUDGET_SV1-1+JSV,'ADVY_BU_RSV')
- ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVW(:,:,:)
- CALL BUDGET (ZRVARS,NBUDGET_SV1-1+JSV,'ADVZ_BU_RSV')
- END IF
+! IF (LBUDGET_SV) THEN
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVU(:,:,:)
+! CALL BUDGET (ZRVARS,NBUDGET_SV1-1+JSV,'ADVX_BU_RSV')
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVV(:,:,:)
+! CALL BUDGET (ZRVARS,NBUDGET_SV1-1+JSV,'ADVY_BU_RSV')
+! ZRVARS(:,:,:) = ZRVARS(:,:,:) + ZFADVW(:,:,:)
+! CALL BUDGET (ZRVARS,NBUDGET_SV1-1+JSV,'ADVZ_BU_RSV')
+! END IF
!
END DO
--
GitLab