diff --git a/src/MNH/adjust_langlois.f90 b/src/MNH/adjust_langlois.f90
index ed6df1d2ac06b4b3574e5b8c5b2673e8f3bcac0f..42c73b53f3bbc5f05cf0d9a2889a4615179cf3e7 100644
--- a/src/MNH/adjust_langlois.f90
+++ b/src/MNH/adjust_langlois.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
+!-------------------------------------------------------------------------------
! ######################
MODULE MODI_ADJUST_LANGLOIS
! ######################
@@ -114,10 +115,8 @@ END MODULE MODI_ADJUST_LANGLOIS
USE MODD_PARAMETERS
USE MODD_CST
USE MODD_CONF
-USE MODD_BUDGET
!
USE MODI_CONDENSATION
-USE MODI_BUDGET
!
IMPLICIT NONE
!
diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index ca9eb25e730b3db3ff21481fc9f5ae08955784f2..4d1e9d9235681ed902c54e3cfb0a38420ac54a85 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/advection_metsv.f90
@@ -160,13 +160,12 @@ USE MODD_BLOWSNOW
USE MODD_BLOWSNOW_n
USE MODD_PARAMETERS
!
-use mode_budget, only: Budget_store_init, Budget_store_end
+use mode_budget, only: Budget_store_init, Budget_store_end
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
USE MODE_ll
USE MODE_MSG
!
USE MODI_ADV_BOUNDARIES
-USE MODI_BUDGET
USE MODI_CONTRAV
USE MODI_GET_HALO
USE MODI_PPM_RHODJ
diff --git a/src/MNH/budget.f90 b/src/MNH/budget.f90
index 22d11c624a6cab29cd377b825fc94e2fc9f4d35f..5d3d18d1188165d942c51c1238a41e2caf903581 100644
--- a/src/MNH/budget.f90
+++ b/src/MNH/budget.f90
@@ -211,495 +211,3 @@ subroutine Budget_source_id_find( tpbudget, hsource, kid )
end subroutine Budget_source_id_find
end module mode_budget
-
-
-!##################
- MODULE MODI_BUDGET
-!##################
-!
-INTERFACE
-!
-SUBROUTINE BUDGET(PVARS,KBUDN,HBUVAR)
-!
-!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PVARS ! Source
-INTEGER , INTENT(IN) :: KBUDN ! variable number
-CHARACTER (LEN=*) , INTENT(IN) :: HBUVAR ! Identifier of the Budget of the
- ! variable that is considered
-!
-END SUBROUTINE BUDGET
-!
-END INTERFACE
-!
-END MODULE MODI_BUDGET
-! #####################################
- SUBROUTINE BUDGET(PVARS,KBUDN,HBUVAR)
-! #####################################
-!
-!!**** *BUDGET* - routine to call the BUDGET routine.
-!!
-!!
-!! PURPOSE
-!! -------
-! This routine selects the variable RVAR, the budget of which is
-! processed in the inner routine BUDGET_CASE. !
-!!** METHOD
-!! ------
-!!
-!!
-!!
-!! EXTERNAL
-!! --------
-!! CART_COMPRESS
-!! MASK_COMPRESS
-!!
-!! IMPLICIT ARGUMENTS
-!! ------------------
-!! Module MODD_BUDGET
-!! XBURU : budget array of the variable RU
-!! XBURV : budget array of the variable RV
-!! XBURW : budget array of the variable RW
-!! XBURTH : budget array of the variable RTH
-!! XBURTKE : budget array of the variable RTKE
-!! XBURRV : budget array of the variable RRV
-!! XBURRC : budget array of the variable RRC
-!! XBURRR : budget array of the variable RRR
-!! XBURRI : budget array of the variable RRI
-!! XBURRS : budget array of the variable RRS
-!! XBURRG : budget array of the variable RRG
-!! XBURRH : budget array of the variable RRH
-!! XBURTKE : budget array of the variable RTKE
-!! XBURSV(x) : budget array of the variable RSVx
-!!
-!! REFERENCE
-!! ---------
-!! None
-!!
-!! AUTHOR
-!! ------
-!! J. Nicolau * Meteo France *
-!!
-!! MODIFICATIONS
-!! -------------
-!! Original 30/08/94
-!! J. Stein 26/06/96 add the 'OF','NO' option
-!! J.-P. Pinty 12/12/96 simplifies the coding
-!! V. Masson 06/10/02 add LES budgets
-!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
-!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
-!! J.Escobar : 09/07/2019 : for bit reproductiblity use MPPDB_CHECK with PRECISION=0.0 error
-!!
-!-------------------------------------------------------------------------------
-!
-!* 0. DECLARATIONS
-! ------------
-!
-USE MODD_BUDGET
-USE MODD_LUNIT
-!USE MODD_CONF_n
-USE MODD_CONF, ONLY : LCHECK
-USE MODD_NSV, ONLY : NSV
-USE MODD_LES
-!
-USE MODE_MSG
-!
-USE MODI_LES_BUDGET
-USE MODI_CART_COMPRESS
-USE MODI_MASK_COMPRESS
-!
-USE MODE_MPPDB
-!
-USE MODI_SECOND_MNH
-!
-IMPLICIT NONE
-!
-!
-!* 0.1 Declarations of arguments :
-!
-INTEGER , INTENT(IN) :: KBUDN ! variable number
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PVARS ! source of the variable
-CHARACTER (LEN=*) , INTENT(IN) :: HBUVAR ! Identifier of the Budget of the
- ! variable that is considered
-INTEGER :: IBUSV ! Index of the SV
-!
-INTEGER :: ILUOUT0 ! Logical unit number for output-listing
-INTEGER :: IRESP ! Return code of FM-routines
-!
-REAL :: ZTIME1 ! CPU time counter
-REAL :: ZTIME2 ! CPU time counter
-!
-!-------------------------------------------------------------------------------
-!
-call Print_msg( NVERB_DEBUG, 'BUD', 'Budget', 'called for '//trim( hbuvar ) )
-
-!* Reproductivity checks
-! Warning: requires an adaptation of the makefile in order to run two runs in
-! parallel for comparison
-!
-IF (LCHECK) THEN
- print*,'BUDGET :',HBUVAR
- CALL MPPDB_CHECK3D(PVARS,HBUVAR,PRECISION)
-END IF
-!
-!
-!* call to LES budgets
-!
-IF (LLES_CALL) CALL LES_BUDGET(PVARS,KBUDN,HBUVAR)
-!
-!* call to prognostic variables budgets
-!
-IF (.NOT. LBU_ENABLE) RETURN
-!
-SELECT CASE (KBUDN)
- CASE ( NBUDGET_U )
- IF (.NOT. LBU_RU) RETURN
- CASE ( NBUDGET_V )
- IF (.NOT. LBU_RV) RETURN
- CASE ( NBUDGET_W )
- IF (.NOT. LBU_RW) RETURN
- CASE (NBUDGET_TH)
- IF (.NOT. LBU_RTH) RETURN
- CASE ( NBUDGET_TKE )
- IF (.NOT. LBU_RTKE) RETURN
- CASE ( NBUDGET_RV )
- IF (.NOT. LBU_RRV) RETURN
- CASE ( NBUDGET_RC )
- IF (.NOT. LBU_RRC) RETURN
- CASE (NBUDGET_RR )
- IF (.NOT. LBU_RRR) RETURN
- CASE ( NBUDGET_RI )
- IF (.NOT. LBU_RRI) RETURN
- CASE ( NBUDGET_RS )
- IF (.NOT. LBU_RRS) RETURN
- CASE ( NBUDGET_RG )
- IF (.NOT. LBU_RRG) RETURN
- CASE ( NBUDGET_RH )
- IF (.NOT. LBU_RRH) RETURN
- CASE ( NBUDGET_SV1 : )
- IF (.NOT. LBU_RSV) RETURN
-END SELECT
-!
-!-------------------------------------------------------------------------------
-!
-CALL SECOND_MNH(ZTIME1)
-!
-SELECT CASE (KBUDN)
-!
- CASE ( NBUDGET_U ) ! ==> RU BUDGET
- CALL BUDGET_CASE(XBURU)
-!
- CASE ( NBUDGET_V ) ! ==> RV BUDGET
- CALL BUDGET_CASE(XBURV)
-!
- CASE ( NBUDGET_W ) ! ==> RW BUDGET
- CALL BUDGET_CASE(XBURW)
-!
- CASE ( NBUDGET_TH ) ! ==> RTH BUDGET
- CALL BUDGET_CASE(XBURTH)
-!
- CASE ( NBUDGET_TKE ) ! ==> RTKE BUDGET
- CALL BUDGET_CASE(XBURTKE)
-!
- CASE ( NBUDGET_RV ) ! ==> RRV BUDGET
- CALL BUDGET_CASE(XBURRV)
-!
- CASE ( NBUDGET_RC ) ! ==> RRC BUDGET
- CALL BUDGET_CASE(XBURRC)
-!
- CASE ( NBUDGET_RR ) ! ==> RRR BUDGET
- CALL BUDGET_CASE(XBURRR)
-!
- CASE ( NBUDGET_RI ) ! ==> RRI BUDGET
- CALL BUDGET_CASE(XBURRI)
-!
- CASE ( NBUDGET_RS ) ! ==> RRS BUDGET
- CALL BUDGET_CASE(XBURRS)
-!
- CASE ( NBUDGET_RG ) ! ==> RRG BUDGET
- CALL BUDGET_CASE(XBURRG)
-!
- CASE ( NBUDGET_RH ) ! ==> RRH BUDGET
- CALL BUDGET_CASE(XBURRH)
-!
- CASE ( NBUDGET_SV1 : ) ! ==> RSVx BUDGET
- IBUSV = KBUDN - ( NBUDGET_SV1 - 1 )
- IF( IBUSV <= NSV ) THEN
- CALL BUDGET_CASE(XBURSV(:,:,:,:,IBUSV))
- ELSE
- ILUOUT0 = TLUOUT0%NLU
- WRITE(UNIT=ILUOUT0,FMT='("BUDGET: SCALAR VARIABLE",I2," IS ABSENT !!")') &
- IBUSV
- WRITE(UNIT=ILUOUT0,FMT='("CHECK FOR THE CALL BUDGET OF THAT VARIABLE")')
-!callabortstop
- CALL PRINT_MSG(NVERB_FATAL,'BUD','BUDGET','')
- END IF
-END SELECT
-!
-CALL SECOND_MNH(ZTIME2)
-!
-XTIME_BU_PROCESS = XTIME_BU_PROCESS + ZTIME2 - ZTIME1
-XTIME_BU = XTIME_BU + ZTIME2 - ZTIME1
-!
-!----------------------------------------------------------------------
-CONTAINS
-!----------------------------------------------------------------------
-! ###############################
- SUBROUTINE BUDGET_CASE(PBURVAR)
-! ###############################
-!
-!!**** *BUDGET_CASE* - routine to call the BUDGET_CASE routine.
-!!
-!!
-!! PURPOSE
-!! -------
-! This routine chooses the right call to the functions CART_COMPRESS
-! or MASK_COMPRESS (which realize the compression of the source PVARS
-! in the different directions) and achieves in function of HACTION (which
-! determines the operations to be executed) the budget for the variable
-! corresponding to the number KBUDN. The budget process counter is
-! incremented by NBUINC depending on the number of active processes in the
-! model.
-!
-!!** METHOD
-!! ------
-!!
-!!
-!!
-!! EXTERNAL
-!! --------
-!! CART_COMPRESS
-!! MASK_COMPRESS
-!!
-!! IMPLICIT ARGUMENTS
-!! ------------------
-!! Module MODD_BUDGET
-!! CBUACTION : type of operation
-!! CBUTYPE : budget type (CART,MASK or NONE)
-!! NBUTIME : number of the budget step
-!! NBUPROCCTR : process counter for each budget variable
-!! PBURVAR : budget array of the variable RVAR
-!!
-!! REFERENCE
-!! ---------
-!! None
-!!
-!! AUTHOR
-!! ------
-!! J.-P. Pinty *Laboratoire d'Aerologie*
-!!
-!! MODIFICATIONS
-!! -------------
-!! Original 12/12/96
-!! Modification 24/06/99 N. Asencio : budget // , the dimensions of the
-!! budget arrays are implicit
-!!
-!-------------------------------------------------------------------------------
-!
-!* 0. DECLARATIONS
-! ------------
-!
- USE MODI_CART_COMPRESS
- USE MODI_MASK_COMPRESS
-!
- IMPLICIT NONE
-!
-!
-!* 0.1 Declarations of arguments :
-!
- REAL, DIMENSION(:,:,:,:), INTENT(INOUT):: PBURVAR ! budget of variable RVAR
-!
-!* 0.2 Declarations of local variables :
- CHARACTER (LEN=99) :: YBUVAR_ADJUSTED ! Adjusted string
- CHARACTER (LEN=99) :: YBUCOMMENT_ADJUSTED ! Adjusted string
- CHARACTER (LEN=99) :: YBUVAR ! local string
- CHARACTER (LEN=99) :: YBUCOMMENT ! local string
-
- INTEGER :: ILEN ! Number of non-blank char.
-!
-!
-!* 1. SECURITY TEST
-! -------------
-!
- YBUVAR = HBUVAR
- YBUCOMMENT = CBUCOMMENT(KBUDN,NBUPROCCTR(KBUDN))
- YBUVAR_ADJUSTED = ADJUSTR(YBUVAR)
- YBUCOMMENT_ADJUSTED = ADJUSTR(YBUCOMMENT)
- ILEN = LEN_TRIM( ADJUSTL(YBUVAR))
-!
- IF( CBUACTION(KBUDN,NBUCTR_ACTV(KBUDN))/='NO'.AND. &
- CBUACTION(KBUDN,NBUCTR_ACTV(KBUDN))/='OF'.AND. &
- CBUACTION(KBUDN,NBUCTR_ACTV(KBUDN))/='CC' ) THEN
- IF( YBUVAR_ADJUSTED(100-ILEN:99) /= YBUCOMMENT_ADJUSTED(100-ILEN:99) &
- .OR. ILEN==0 ) THEN
- ILUOUT0 = TLUOUT0%NLU
- WRITE(UNIT=ILUOUT0,FMT='("BUDGET: WRONG BUDGET IDENTIFICATION !!")')
- WRITE(UNIT=ILUOUT0,FMT='("BUDGET: PRESENT VARIABLE: ",I2)') KBUDN
- WRITE(UNIT=ILUOUT0,FMT='("BUDGET: PRESENT IDENTIFIER: ",A99)') &
- YBUVAR_ADJUSTED
- WRITE(UNIT=ILUOUT0,FMT='("BUDGET: EXPECTED IDENTIFIER: ",A99)') &
- YBUCOMMENT_ADJUSTED
- WRITE(UNIT=ILUOUT0,FMT='("PLEASE CHECK THE CALL BUDGET OF THE VARIABLE")')
- WRITE(UNIT=ILUOUT0,FMT='("AND THE BUDGET PROCESS ORDER IN INI_BUDGET !")')
-!callabortstop
- CALL PRINT_MSG(NVERB_FATAL,'BUD','BUDGET','')
- END IF
- END IF
-!
-! Budget integration in case of successful test
-!
- SELECT CASE (CBUTYPE)
-!
-!* 2. "CART" CASE
-! -----------
-!
- CASE ('CART')
-!
- SELECT CASE (CBUACTION(KBUDN,NBUCTR_ACTV(KBUDN)))
-!
-!* 2.1 Budget beginning : initial fields
-! filled in budget tabulars (NBUPROCCTR=1)
-!
- CASE('IG')
- PBURVAR(:,:,:,1)=CART_COMPRESS(PVARS)
-!
-!* 2.2 average tendancy filled every time
-! step in budget tabulars (NBUPROCCTR=3)
-!
- CASE('ES')
- PBURVAR(:,:,:,3)=PBURVAR(:,:,:,3)+CART_COMPRESS(PVARS)/NBUSTEP
-!
-!* 2.3 Cumul of the sources
-!
- CASE('CC')
- PBURVAR(:,:,:,2)=CART_COMPRESS(PVARS)
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
-!
-!* 2.4 Difference in order to compute the budget
-! for the process NBUPROCCTR
-!
- CASE('DD')
- PBURVAR(:,:,:,NBUPROCCTR(KBUDN))= PBURVAR(:,:,:,NBUPROCCTR(KBUDN)) &
- + CART_COMPRESS(PVARS) &
- - PBURVAR(:,:,:,2)
- NBUPROCCTR(KBUDN)=NBUPROCCTR(KBUDN)+1
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
-!
-!* 2.5 Difference in order to compute the budget for the
-! process NBUPROCCTR and Cumul of the sources (NBUPROCCTR=2)
-!
- CASE('DC')
- PBURVAR(:,:,:,NBUPROCCTR(KBUDN)) = PBURVAR(:,:,:,NBUPROCCTR(KBUDN))&
- + CART_COMPRESS(PVARS) &
- - PBURVAR(:,:,:,2)
- PBURVAR(:,:,:,2)=CART_COMPRESS(PVARS)
- NBUPROCCTR(KBUDN)=NBUPROCCTR(KBUDN)+1
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
- CASE('NO')
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
- CASE('OF')
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
- RETURN
- END SELECT
-!
-!* 3. "MASK" CASE
-! -----------
-!
- CASE ('MASK')
-!
- SELECT CASE (CBUACTION(KBUDN,NBUCTR_ACTV(KBUDN)))
-!
-!* 3.1 Budget beginning : initial fields
-! filled in budget tabulars (NBUPROC=1)
-!
- CASE('IG')
- PBURVAR(:,NBUTIME,:,1) = MASK_COMPRESS(PVARS)
-!
-!* 3.2 average tendancy filled every time
-! step in budget tabulars (NBUPROCCTR=3)
-!
- CASE('ES')
- PBURVAR(:,NBUTIME,:,3) = PBURVAR(:,NBUTIME,:,3) &
- + MASK_COMPRESS(PVARS)/NBUSTEP
-!
-!* 3.3 Cumul of the sources
-!
- CASE('CC')
- PBURVAR(:,NBUTIME,:,2)=MASK_COMPRESS(PVARS)
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
-!
-!* 3.4 Difference in order to compute the budget
-! for the process NBUPROCCTR
-!
- CASE('DD')
- PBURVAR(:,NBUTIME,:,NBUPROCCTR(KBUDN)) &
- = PBURVAR(:,NBUTIME,:,NBUPROCCTR(KBUDN)) &
- + MASK_COMPRESS(PVARS) &
- - PBURVAR(:,NBUTIME,:,2)
- NBUPROCCTR(KBUDN)=NBUPROCCTR(KBUDN)+1
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
-!
-!* 3.5 Difference in order to compute the budget for the
-! process NBUPROCCTR and Cumul of the sources (NBUPROCCTR=2)
-!
- CASE('DC')
- PBURVAR(:,NBUTIME,:,NBUPROCCTR(KBUDN)) &
- = PBURVAR(:,NBUTIME,:,NBUPROCCTR(KBUDN)) &
- +MASK_COMPRESS(PVARS) &
- -PBURVAR(:,NBUTIME,:,2)
- PBURVAR(:,NBUTIME,:,2)=MASK_COMPRESS(PVARS)
- NBUPROCCTR(KBUDN)=NBUPROCCTR(KBUDN)+1
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
- CASE('NO')
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
- CASE('OF')
-!
-! advance the process counter
-!
- NBUCTR_ACTV(KBUDN) = NBUCTR_ACTV(KBUDN) &
- + NBUINC(KBUDN,NBUCTR_ACTV(KBUDN))
- RETURN
- END SELECT
- END SELECT
-!
- END SUBROUTINE BUDGET_CASE
-!
-!-------------------------------------------------------------------------------
-!
-!
-END SUBROUTINE BUDGET
diff --git a/src/MNH/eddyUV_fluxn.f90 b/src/MNH/eddyUV_fluxn.f90
index fd153a867bec7ddf0caf7040dad45eee41f1a5d2..924e2dd2b67a7daa0c0d58ea21e97a2dc0c378b3 100644
--- a/src/MNH/eddyUV_fluxn.f90
+++ b/src/MNH/eddyUV_fluxn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2020 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #########################
@@ -72,10 +72,8 @@ USE MODE_ll
!
USE MODD_PARAMETERS
USE MODD_CONF
-USE MODD_BUDGET
!
USE MODI_SHUMAN
-USE MODI_BUDGET
USE MODD_CST
!
USE MODD_DIM_n
diff --git a/src/MNH/eddy_fluxn.f90 b/src/MNH/eddy_fluxn.f90
index e2b92e8a98420147be2a4c3807d0e875b003b1eb..aa3148e7c226c5c0633dd8bf52e56aa4bca45ee3 100644
--- a/src/MNH/eddy_fluxn.f90
+++ b/src/MNH/eddy_fluxn.f90
@@ -1,6 +1,6 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2020 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #######################
@@ -76,10 +76,8 @@ USE MODE_ll
!
USE MODD_PARAMETERS
USE MODD_CONF
-USE MODD_BUDGET
!
USE MODI_SHUMAN
-USE MODI_BUDGET
USE MODD_CST
!
USE MODD_DIM_n
diff --git a/src/MNH/endstep.f90 b/src/MNH/endstep.f90
index 4a7d01269e6db88ca6e54f2ac97df480b9758f81..dfa7e6195ca56f8272f8019ab15949207d678e01 100644
--- a/src/MNH/endstep.f90
+++ b/src/MNH/endstep.f90
@@ -221,7 +221,6 @@ USE MODD_PARAM_LIMA, ONLY: LACTIT_LIMA=>LACTIT
use mode_budget, only: Budget_store_end, Budget_store_init
-USE MODI_BUDGET
USE MODI_SHUMAN
!
USE MODE_ll
diff --git a/src/MNH/gravity.f90 b/src/MNH/gravity.f90
index 271d5910224e272416ac75decb3a6269fb4b0452..a6432a68e01bd0429e334171bfe4959aa80427f2 100644
--- a/src/MNH/gravity.f90
+++ b/src/MNH/gravity.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
! ###################
MODULE MODI_GRAVITY
! ###################
@@ -115,7 +111,6 @@ USE MODD_CONF
USE MODD_CST
!
USE MODI_SHUMAN
-USE MODI_BUDGET
USE MODI_GET_HALO
!
IMPLICIT NONE
diff --git a/src/MNH/ice4_fast_ri.f90 b/src/MNH/ice4_fast_ri.f90
index aa4d60a6f823fa0d11d8d5da9591611da9730f5d..1a067377ad55f460c21fef8505000201342af8de 100644
--- a/src/MNH/ice4_fast_ri.f90
+++ b/src/MNH/ice4_fast_ri.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
+!-------------------------------------------------------------------------------
MODULE MODI_ICE4_FAST_RI
INTERFACE
SUBROUTINE ICE4_FAST_RI(KSIZE, LDSOFT, LDCOMPUTE, &
@@ -17,8 +18,6 @@ SUBROUTINE ICE4_FAST_RI(KSIZE, LDSOFT, LDCOMPUTE, &
USE MODD_CST
USE MODD_RAIN_ICE_PARAM
USE MODD_RAIN_ICE_DESCR
-USE MODI_BUDGET
-USE MODD_BUDGET
!
IMPLICIT NONE
!
diff --git a/src/MNH/ice4_sedimentation_split_old.f90 b/src/MNH/ice4_sedimentation_split_old.f90
index 47095b89e40dd5e36d700b22d0c611e22130bade..9c684754ce4de6f58ecf9e2e969fa056c215a565 100644
--- a/src/MNH/ice4_sedimentation_split_old.f90
+++ b/src/MNH/ice4_sedimentation_split_old.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -75,7 +75,6 @@ SUBROUTINE ICE4_SEDIMENTATION_SPLIT_OLD(KIB, KIE, KIT, KJB, KJE, KJT, KKB, KKE,
!* 0. DECLARATIONS
! ------------
!
-USE MODD_BUDGET
USE MODD_CST
USE MODD_RAIN_ICE_DESCR
USE MODD_RAIN_ICE_PARAM
@@ -83,7 +82,6 @@ USE MODD_RAIN_ICE_PARAM
USE MODE_MSG
use mode_tools, only: Countjv
-USE MODI_BUDGET
USE MODI_GAMMA
!
IMPLICIT NONE
diff --git a/src/MNH/ice4_sedimentation_stat.f90 b/src/MNH/ice4_sedimentation_stat.f90
index 4194c36771a7ffb1141be74f0eb81b2f7a684921..4dcf0ff8b67c20f37eedc21184b279e30fdf6911 100644
--- a/src/MNH/ice4_sedimentation_stat.f90
+++ b/src/MNH/ice4_sedimentation_stat.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2020 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.
@@ -79,13 +79,10 @@ SUBROUTINE ICE4_SEDIMENTATION_STAT(KIB, KIE, KIT, KJB, KJE, KJT, KKB, KKE, KKTB,
!* 0. DECLARATIONS
! ------------
!
-USE MODD_BUDGET
USE MODD_CST
USE MODE_MSG
-USE MODI_BUDGET
-
IMPLICIT NONE
!
!* 0.1 Declarations of dummy arguments :
diff --git a/src/MNH/lima_ccn_hom_freezing.f90 b/src/MNH/lima_ccn_hom_freezing.f90
index 26948c4f4cfd7c5e4903a040993cc3a33e7c236c..a716c4da7ee57d02bf637d56a4be01af1c47463d 100644
--- a/src/MNH/lima_ccn_hom_freezing.f90
+++ b/src/MNH/lima_ccn_hom_freezing.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 2013-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2020 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.
+!-------------------------------------------------------------------------------
! #################################
MODULE MODI_LIMA_CCN_HOM_FREEZING
! #################################
@@ -64,7 +65,6 @@ END MODULE MODI_LIMA_CCN_HOM_FREEZING
!* 0. DECLARATIONS
! ------------
!
-USE MODD_BUDGET
USE MODD_CST, ONLY: XP00, XRD, XRV, XMV, XMD, XCPD, XCPV, XCL, XCI, &
XTT, XLSTT, XLVTT, XALPI, XBETAI, XGAMI, &
XG
@@ -81,8 +81,6 @@ USE MODD_PARAM_LIMA_WARM, ONLY: XLBC
!
use mode_tools, only: Countjv
!
-USE MODI_BUDGET
-!
IMPLICIT NONE
!
!* 0.1 Declarations of dummy arguments :
diff --git a/src/MNH/pressurez.f90 b/src/MNH/pressurez.f90
index ba64b6d964666b0c7150a4c1c909e90533d0feb0..87fc7063ade94b65b7633a5642cb199494aedd39 100644
--- a/src/MNH/pressurez.f90
+++ b/src/MNH/pressurez.f90
@@ -237,13 +237,12 @@ use modd_precision, only: MNHREAL_MPI
USE MODD_REF, ONLY: LBOUSS
USE MODD_VAR_ll, ONLY: NMNH_COMM_WORLD , NPROC
!
-use mode_budget, only: Budget_store_end
+use mode_budget, only: Budget_store_end
USE MODE_ll
USE MODE_MPPDB
USE MODE_MSG
USE MODE_SUM2_ll, ONLY: GMAXLOC_ll
!
-USE MODI_BUDGET
USE MODI_CONJGRAD
USE MODI_CONRESOL
USE MODI_CONRESOLZ
diff --git a/src/MNH/set_grid.f90 b/src/MNH/set_grid.f90
index 051b9c76ff244a17e5ac075ee5718c16d622bc5f..80b75a18778e0127d1c9792f21fc9e387e76c193 100644
--- a/src/MNH/set_grid.f90
+++ b/src/MNH/set_grid.f90
@@ -211,7 +211,6 @@ END MODULE MODI_SET_GRID
!
!* 0. DECLARATIONS
! ------------
-USE MODD_BUDGET
USE MODD_CONF
USE MODD_CONF_n
USE MODD_DYN
diff --git a/src/MNH/turb.f90 b/src/MNH/turb.f90
index 026ede0381603b6068cfe8ffe6859d19de7a0d8e..cbd731e713867673b61430a2b275e92de396127e 100644
--- a/src/MNH/turb.f90
+++ b/src/MNH/turb.f90
@@ -369,7 +369,6 @@ USE MODI_TURB_HOR_SPLT
USE MODI_TKE_EPS_SOURCES
USE MODI_SHUMAN
USE MODI_GRADIENT_M
-USE MODI_BUDGET
USE MODI_LES_MEAN_SUBGRID
USE MODI_RMC01
USE MODI_GRADIENT_W