From 99c05f3fa8efbe64699747a11c1ed39fd55d0efe Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 15 Nov 2019 14:51:57 +0100
Subject: [PATCH] Philippe 15/11/2019: remove unused CBURECORD variable
---
src/MNH/ini_budget.f90 | 19 ++-----------------
src/MNH/modd_budget.f90 | 3 +--
src/MNH/write_budget.f90 | 1 -
3 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90
index 21bd6fe45..2a4174b6d 100644
--- a/src/MNH/ini_budget.f90
+++ b/src/MNH/ini_budget.f90
@@ -154,6 +154,7 @@ END MODULE MODI_INI_BUDGET
!! S. Riette 11/2016 New budgets for ICE3/ICE4
!! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! P. Wautelet 10/04/2019: replace ABORT and STOP calls by Print_msg
+! P. Wautelet 15/11/2019: remove unused CBURECORD variable
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -232,7 +233,6 @@ INTEGER, DIMENSION(JPBUMAX,JPBUPROMAX+1) :: IPROACTV ! switches set by the
! activation
INTEGER :: JI, JJ, JK , JJJ ! loop indices
INTEGER :: IIMAX_ll, IJMAX_ll ! size of the physical global domain
-INTEGER :: ITEN ! tens for CBURECORD
INTEGER :: IPROC ! counter for processes
INTEGER :: IIU, IJU ! size along x and y directions
! of the extended subdomain
@@ -395,12 +395,10 @@ ALLOCATE( NBUPROCNBR(JPBUMAX) )
ALLOCATE( NBUPROCCTR(JPBUMAX) )
ALLOCATE( CBUACTION(JPBUMAX, JPBUPROMAX) )
ALLOCATE( CBUCOMMENT(JPBUMAX, JPBUPROMAX) )
-ALLOCATE( CBURECORD(JPBUMAX, JPBUPROMAX) )
NBUPROCCTR(:) = 0
NBUCTR_ACTV(:) = 0
NBUPROCNBR(:) = 0
CBUACTION(:,:) = 'OF'
-CBURECORD(:,:) = ' '
CBUCOMMENT(:,:) = ' '
LBU_BEG =.TRUE.
!
@@ -2664,12 +2662,7 @@ END DO
! -----------------------------------------------------------
!
!
-DO JI=1,JPBUMAX ! loop on the allowed budgets
- ! names of recording files for:
- CBURECORD(JI,1) = ADJUSTL( CBUCOMMENT(JI,1) ) ! initial guess
- CBURECORD(JI,2) = ADJUSTL( CBUCOMMENT(JI,2) ) ! source cumul
- CBURECORD(JI,3) = ADJUSTL( CBUCOMMENT(JI,3) ) ! end step
-!
+DO JI=1,JPBUMAX ! loop on the allowed budgets names of recording files
IF (IPROACTV(JI,4) >= 2) THEN
WRITE(UNIT=KLUOUT,FMT= '("Error in budget specification of ",A7,/," &
& The first source either is the first element of a group of sources or &
@@ -2702,10 +2695,6 @@ DO JI=1,JPBUMAX ! loop on the allowed budgets
ADJUSTR( CBUCOMMENT(JI,NBUPROCNBR(JI)) ) // &
ADJUSTL( ADJUSTR( YWORK2(JI,JJ) ) // &
ADJUSTL( YEND_COMMENT(JI) ) ) )
- ITEN=INT(NBUPROCNBR(JI)/10)
- CBURECORD(JI,NBUPROCNBR(JI)) = 'S' // CHAR( ITEN + 48 ) &
- // CHAR( 48+ MODULO( NBUPROCNBR(JI),10*MAX(1,ITEN) ) ) &
- // '_' // ADJUSTL( YEND_COMMENT(JI) )
ELSE IF (IPROACTV(JI,JJJ) == 0) THEN
NBUPROCNBR(JI) = NBUPROCNBR(JI)+1
CBUACTION(JI,JJ) = 'DD'
@@ -2713,10 +2702,6 @@ DO JI=1,JPBUMAX ! loop on the allowed budgets
ADJUSTR( CBUCOMMENT(JI,NBUPROCNBR(JI)) ) // &
ADJUSTL( ADJUSTR( YWORK2(JI,JJ) ) // &
ADJUSTL( YEND_COMMENT(JI) ) ) )
- ITEN=INT(NBUPROCNBR(JI)/10)
- CBURECORD(JI,NBUPROCNBR(JI)) = 'S' // CHAR( ITEN + 48 ) &
- // CHAR( 48+ MODULO( NBUPROCNBR(JI),10*MAX(1,ITEN) ) ) &
- // '_' // ADJUSTL( YEND_COMMENT(JI) )
ELSE IF (IPROACTV(JI,JJJ) == 2) THEN
CBUACTION(JI,JJ) = 'NO'
CBUCOMMENT(JI,NBUPROCNBR(JI)+1) = ADJUSTL( &
diff --git a/src/MNH/modd_budget.f90 b/src/MNH/modd_budget.f90
index f376453dc..56e11dcee 100644
--- a/src/MNH/modd_budget.f90
+++ b/src/MNH/modd_budget.f90
@@ -44,6 +44,7 @@
!! S. Riette 11/2016 New budgets for ICE3/ICE4
! P. Wautelet 05/2016-04/2018: new data structures and calls for I/O
! P. Wautelet 19/07/2019: parameters to identify budget number
+! P. Wautelet 15/11/2019: remove unused CBURECORD variable
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -95,8 +96,6 @@ CHARACTER(LEN=2), SAVE, DIMENSION(:,:), & ! resulting string character of the
ALLOCATABLE :: CBUACTION ! transcription of the budget actions
! (integer) read in namelists or
! set by default
-CHARACTER (LEN=NMNHNAMELGTMAX), SAVE, DIMENSION(:,:),& ! names of records on the FM file
- ALLOCATABLE :: CBURECORD ! for the budgets
!
CHARACTER (LEN=99), SAVE, DIMENSION(:,:),& ! name of a process for a budget. It
ALLOCATABLE :: CBUCOMMENT ! will appear in the comment part of
diff --git a/src/MNH/write_budget.f90 b/src/MNH/write_budget.f90
index dfdcd50e7..5f6ab614a 100644
--- a/src/MNH/write_budget.f90
+++ b/src/MNH/write_budget.f90
@@ -85,7 +85,6 @@ subroutine Write_budget( tpdiafile, tpdtcur, ptstep, ksv )
!! Module MODD_BUDGET
!!
!! CBUTYPE : Budget type (CART,MASK,SKIP or NONE)
-!! CBURECORD : name of output recording files for the budgets
!! CBUCOMMENT : name of a process for a budget
!! NBUPROCNBR : number of processes for each variable
!! NBUTIME : number of the budget time intervals ('MASK' case)
--
GitLab