From a9e2a49fc189647fb9d7b39cf444675549baeeca Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 13 Mar 2020 10:15:53 +0100
Subject: [PATCH] Philippe 13/03/2020: budgets: remove JPBUMAX and JPBUPROMAX
---
src/MNH/ini_budget.f90 | 7 +------
src/MNH/modd_budget.f90 | 5 ++---
src/MNH/modd_parameters.f90 | 4 +---
src/MNH/modn_budget.f90 | 3 +--
4 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90
index af5bfea3d..52ca223f9 100644
--- a/src/MNH/ini_budget.f90
+++ b/src/MNH/ini_budget.f90
@@ -47,12 +47,7 @@ contains
!!
!! IMPLICIT ARGUMENTS
!! ------------------
-!! Module MODD_PARAMETERS: JPBUMAX,JPBUPROMAX
-!!
-!! Module MODD_CONF: CCONF
-!!
-!! Module MODD_DYN: XSEGLEN
-!!
+!! Modules MODD_*
!!
!! REFERENCE
!! ---------
diff --git a/src/MNH/modd_budget.f90 b/src/MNH/modd_budget.f90
index e78adebe5..57bfd97ac 100644
--- a/src/MNH/modd_budget.f90
+++ b/src/MNH/modd_budget.f90
@@ -17,7 +17,6 @@
!!
!!** IMPLICIT ARGUMENTS
!! ------------------
-!! MODD_PARAMETERS: JPBUMAX, JPBUPROCMAX
!!
!! REFERENCE
!! ---------
@@ -58,7 +57,7 @@
! ------------
use modd_field, only: tfield_metadata_base
-use modd_parameters, only: JPBUMAX, JPBUPROMAX, NBUNAMELGTMAX, NCOMMENTLGTMAX
+use modd_parameters, only: NBUNAMELGTMAX, NCOMMENTLGTMAX
implicit none
@@ -194,7 +193,7 @@ INTEGER, SAVE :: NBUKMAX ! dimension along K of the budget
! Allowed processes for the budget of the x scalar variables
! (transport part only)
!
-! For each budget, the switches values (from 0 to JPBUPROMAX) for budgets
+! For each budget, the switches values for budgets
! activation may be set by the user in a namelist. Their default value is 0.
! In the following declaration, the corresponding process names are given
! beside as comments.
diff --git a/src/MNH/modd_parameters.f90 b/src/MNH/modd_parameters.f90
index 0e01912f6..7f5d026d5 100644
--- a/src/MNH/modd_parameters.f90
+++ b/src/MNH/modd_parameters.f90
@@ -42,6 +42,7 @@
! P. Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! Q. Rodier 29/03/2019: increase maximum number of outputs to 999
! P. Wautelet 17/01/2020: add NBUNAMELGTMAX and NCOMMENTLGTMAX parameters
+! P. Wautelet 13/03/2020: remove JPBUMAX and JPBUPROMAX
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -58,9 +59,6 @@ INTEGER, PARAMETER :: JPVEXT = 1 ! Vertical External points number
INTEGER, PARAMETER :: JPVEXT_TURB = 1 ! Vertical External points number
INTEGER, PARAMETER :: JPMODELMAX = 8 ! Maximum allowed number of nested models
INTEGER, PARAMETER :: JPCPLFILEMAX = 24 ! Maximum allowed number of CouPLing FILEs
-INTEGER, PARAMETER :: JPBUMAX= 250 ! Maximum of allowed budgets
-INTEGER, PARAMETER :: JPBUPROMAX = 60 ! Maximum of allowed processes for all
- ! budgets
INTEGER, PARAMETER :: JPRIMMAX = 6 ! Maximum number of points for the
! horizontal relaxation for the outermost verticals
INTEGER, PARAMETER :: JPSVMAX = 200 ! Maximum number of scalar variables
diff --git a/src/MNH/modn_budget.f90 b/src/MNH/modn_budget.f90
index 9276582fc..e7d930ddd 100644
--- a/src/MNH/modn_budget.f90
+++ b/src/MNH/modn_budget.f90
@@ -92,8 +92,7 @@
!!
!!
!! Variables specific to a budget
-!! Their values are integer from 0 to JPBUPROMAX (max. of possible
-!! processes). The mechanism for activating a given process is detailled
+!! The mechanism for activating a given process is detailled
!! in Book 3. Each variable name is related to the location of the
!! process in the run and may be decomposed in 2 parts: the first part
!! gives the name of the process implicated and the second part gives
--
GitLab