From 8c8c999c7f4552a846b49cf689d85b53dc8ecd91 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Mon, 28 Jun 2021 10:16:46 +0200
Subject: [PATCH] Philippe 28/06/2021: better respect of Doctor norm: R_COUNT
-> NR_COUNT
---
src/MNH/ini_modeln.f90 | 2 +-
src/MNH/modd_recycl_paramn.f90 | 6 ++---
src/MNH/read_field.f90 | 4 ++--
src/MNH/recycl_fluc.f90 | 41 +++++++++++++++++-----------------
src/MNH/recycling.f90 | 12 +++++-----
src/MNH/write_lfin.f90 | 2 +-
6 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index e9b6f259d..43d150229 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -712,7 +712,7 @@ CALL UPDATE_NSV(KMI)
!
IF (LRECYCL) THEN
!
- R_COUNT = 0
+ NR_COUNT = 0
!
ALLOCATE(XUMEANW(IJU,IKU,INT(XNUMBELT))) ; XUMEANW = 0.0
ALLOCATE(XVMEANW(IJU,IKU,INT(XNUMBELT))) ; XVMEANW = 0.0
diff --git a/src/MNH/modd_recycl_paramn.f90 b/src/MNH/modd_recycl_paramn.f90
index ec5fb0f2e..bfc4d7b3e 100644
--- a/src/MNH/modd_recycl_paramn.f90
+++ b/src/MNH/modd_recycl_paramn.f90
@@ -47,7 +47,7 @@ REAL :: XDRECYCLN,XDRECYCLW,XDRECYCLE,XDRECYCLS, &
XARECYCLN,XARECYCLW,XARECYCLE,XARECYCLS, &
XTMOY,XTMOYCOUNT,XNUMBELT,XRCOEFF,XTBVTOP,XTBVBOT
-INTEGER :: R_COUNT
+INTEGER :: NR_COUNT
REAL, DIMENSION(:,:,:) ,POINTER :: XUMEANW=>NULL()
REAL, DIMENSION(:,:,:) ,POINTER :: XVMEANW=>NULL()
REAL, DIMENSION(:,:,:) ,POINTER :: XWMEANW=>NULL()
@@ -101,7 +101,7 @@ REAL, DIMENSION(:,:,:),POINTER :: XWMEANS=>NULL()
-INTEGER ,POINTER :: R_COUNT =>NULL()
+INTEGER ,POINTER :: NR_COUNT =>NULL()
REAL, DIMENSION(:,:,:) ,POINTER :: XTBV=>NULL()
CONTAINS
@@ -160,7 +160,7 @@ XUMEANS=>RECYCL_MODEL(KTO)%XUMEANS
XVMEANS=>RECYCL_MODEL(KTO)%XVMEANS
XWMEANS=>RECYCL_MODEL(KTO)%XWMEANS
-R_COUNT=>RECYCL_MODEL(KTO)%R_COUNT
+NR_COUNT=>RECYCL_MODEL(KTO)%NR_COUNT
END SUBROUTINE RECYCL_GOTO_MODEL
diff --git a/src/MNH/read_field.f90 b/src/MNH/read_field.f90
index 2569f5370..f6ae881a7 100644
--- a/src/MNH/read_field.f90
+++ b/src/MNH/read_field.f90
@@ -663,9 +663,9 @@ IF (ZLRECYCL) THEN
TZFIELD%NTYPE = TYPEINT
TZFIELD%NDIMS = 0
TZFIELD%LTIMEDEP = .TRUE.
- CALL IO_Field_read(TPINIFILE,TZFIELD,R_COUNT)
+ CALL IO_Field_read(TPINIFILE,TZFIELD,NR_COUNT)
!
- IF (R_COUNT .NE. 0) THEN
+ IF (NR_COUNT .NE. 0) THEN
IF (LRECYCLW) THEN
TZFIELD%CMNHNAME = 'URECYCLW'
TZFIELD%CLONGNAME = 'URECYCLW'
diff --git a/src/MNH/recycl_fluc.f90 b/src/MNH/recycl_fluc.f90
index 10a055359..2ee5471c1 100644
--- a/src/MNH/recycl_fluc.f90
+++ b/src/MNH/recycl_fluc.f90
@@ -9,11 +9,11 @@
!
INTERFACE
!
-SUBROUTINE RECYCL_FLUC (PPTABU,PPTABV,PPTABW,PTHT,PDZZ,OR_COUNT,OPT_COUNT,PMINW,PMINN,PMINE,PMINS, &
+SUBROUTINE RECYCL_FLUC (PPTABU,PPTABV,PPTABW,PTHT,PDZZ,ONR_COUNT,OPT_COUNT,PMINW,PMINN,PMINE,PMINS, &
PFLUCTUNW,PFLUCTVNN,PFLUCTUTN,PFLUCTVTW,PFLUCTWTW,PFLUCTWTN, &
PFLUCTUNE,PFLUCTVNS,PFLUCTUTS,PFLUCTVTE,PFLUCTWTE,PFLUCTWTS )
- INTEGER ,INTENT(IN) :: OR_COUNT,OPT_COUNT,PMINW,PMINN,PMINE,PMINS
+ INTEGER ,INTENT(IN) :: ONR_COUNT,OPT_COUNT,PMINW,PMINN,PMINE,PMINS
REAL, DIMENSION(:,:,:) ,INTENT(IN) :: PPTABU,PPTABV,PPTABW,PTHT,PDZZ
REAL, DIMENSION(:,:) ,INTENT(INOUT) :: PFLUCTUNW,PFLUCTVTW,PFLUCTVNN,PFLUCTUTN,PFLUCTWTW,PFLUCTWTN
REAL, DIMENSION(:,:) ,INTENT(INOUT) :: PFLUCTUNE,PFLUCTVTE,PFLUCTVNS,PFLUCTUTS,PFLUCTWTE,PFLUCTWTS
@@ -27,7 +27,7 @@ END MODULE MODI_RECYCL_FLUC
!
!
! ####################################
- SUBROUTINE RECYCL_FLUC (PPTABU,PPTABV,PPTABW,PTHT,PDZZ,OR_COUNT,OPT_COUNT,PMINW,PMINN,PMINE,PMINS, &
+ SUBROUTINE RECYCL_FLUC (PPTABU,PPTABV,PPTABW,PTHT,PDZZ,ONR_COUNT,OPT_COUNT,PMINW,PMINN,PMINE,PMINS, &
PFLUCTUNW,PFLUCTVNN,PFLUCTUTN,PFLUCTVTW,PFLUCTWTW,PFLUCTWTN, &
PFLUCTUNE,PFLUCTVNS,PFLUCTUTS,PFLUCTVTE,PFLUCTWTE,PFLUCTWTS )
@@ -99,7 +99,6 @@ USE MODI_GRADIENT_W
USE MODI_GRADIENT_U
USE MODI_GRADIENT_V
USE MODE_GRIDPROJ
-USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_REF
USE MODD_LATZ_EDFLX
!
@@ -110,7 +109,7 @@ IMPLICIT NONE
!------------------------------------------------------------------------------
!
! 0.1 declarations of arguments
- INTEGER ,INTENT(IN) :: OR_COUNT,OPT_COUNT,PMINW,PMINN,PMINE,PMINS
+ INTEGER ,INTENT(IN) :: ONR_COUNT,OPT_COUNT,PMINW,PMINN,PMINE,PMINS
REAL, DIMENSION(:,:,:) ,INTENT(IN) :: PPTABU,PPTABV,PPTABW,PTHT,PDZZ
REAL, DIMENSION(:,:) ,INTENT(INOUT) :: PFLUCTUNW,PFLUCTVTW,PFLUCTVNN,PFLUCTUTN,PFLUCTWTW,PFLUCTWTN
REAL, DIMENSION(:,:) ,INTENT(INOUT) :: PFLUCTUNE,PFLUCTVTE,PFLUCTVNS,PFLUCTUTS,PFLUCTWTE,PFLUCTWTS
@@ -216,13 +215,13 @@ IF (LRECYCLW) THEN
!
! *** Mean and fluctuations calculation
!
- IF(OR_COUNT.LE.XTMOY.AND.MOD(OR_COUNT,INT(XTMOYCOUNT))==0) THEN
- ICOUNT=OR_COUNT/XTMOYCOUNT
+ IF(ONR_COUNT.LE.XTMOY.AND.MOD(ONR_COUNT,INT(XTMOYCOUNT))==0) THEN
+ ICOUNT=ONR_COUNT/XTMOYCOUNT
XUMEANW(:,:,ICOUNT)=ZTMPUNW(:,:)
XVMEANW(:,:,ICOUNT)=ZTMPVTW(:,:)
XWMEANW(:,:,ICOUNT)=ZTMPWTW(:,:)
ENDIF
- IF(OR_COUNT.GT.XTMOY.AND.MOD(OR_COUNT,INT(XTMOYCOUNT))==0.AND.OPT_COUNT/=1) THEN
+ IF(ONR_COUNT.GT.XTMOY.AND.MOD(ONR_COUNT,INT(XTMOYCOUNT))==0.AND.OPT_COUNT/=1) THEN
DO JCOUNT=1,INT(XNUMBELT)-1
XUMEANW(:,:,JCOUNT)=XUMEANW(:,:,JCOUNT+1)
XVMEANW(:,:,JCOUNT)=XVMEANW(:,:,JCOUNT+1)
@@ -244,7 +243,7 @@ IF (LRECYCLW) THEN
ENDIF
ENDDO
ENDDO
- IF(R_COUNT.GT.XTMOY) THEN
+ IF(NR_COUNT.GT.XTMOY) THEN
ZTMPFUNW =ZTMPUNW(:,:)-(SUM(XUMEANW,DIM=3)/INT(XNUMBELT))
ZTMPFVTW =ZTMPVTW(:,:)-(SUM(XVMEANW,DIM=3)/INT(XNUMBELT))
ZTMPFWTW =ZTMPWTW(:,:)-(SUM(XWMEANW,DIM=3)/INT(XNUMBELT))
@@ -291,13 +290,13 @@ IF (LRECYCLN) THEN
!
! *** Mean and fluctuations calculation
!
- IF(OR_COUNT.LE.XTMOY.AND.MOD(OR_COUNT,INT(XTMOYCOUNT))==0) THEN
- ICOUNT=OR_COUNT/XTMOYCOUNT
+ IF(ONR_COUNT.LE.XTMOY.AND.MOD(ONR_COUNT,INT(XTMOYCOUNT))==0) THEN
+ ICOUNT=ONR_COUNT/XTMOYCOUNT
XUMEANN(:,:,ICOUNT)=ZTMPUTN(:,:)
XVMEANN(:,:,ICOUNT)=ZTMPVNN(:,:)
XWMEANN(:,:,ICOUNT)=ZTMPWTN(:,:)
ENDIF
- IF(OR_COUNT.GT.XTMOY.AND.MOD(OR_COUNT,INT(XTMOYCOUNT))==0.AND.OPT_COUNT/=1) THEN
+ IF(ONR_COUNT.GT.XTMOY.AND.MOD(ONR_COUNT,INT(XTMOYCOUNT))==0.AND.OPT_COUNT/=1) THEN
DO JCOUNT=1,INT(XNUMBELT)-1
XUMEANN(:,:,JCOUNT)=XUMEANN(:,:,JCOUNT+1)
XVMEANN(:,:,JCOUNT)=XVMEANN(:,:,JCOUNT+1)
@@ -320,7 +319,7 @@ IF (LRECYCLN) THEN
ENDIF
ENDDO
ENDDO
- IF(R_COUNT.GT.XTMOY) THEN
+ IF(NR_COUNT.GT.XTMOY) THEN
ZTMPFUTN =ZTMPUTN(:,:)-(SUM(XUMEANN,DIM=3)/INT(XNUMBELT))
ZTMPFVNN =ZTMPVNN(:,:)-(SUM(XVMEANN,DIM=3)/INT(XNUMBELT))
ZTMPFWTN =ZTMPWTN(:,:)-(SUM(XWMEANN,DIM=3)/INT(XNUMBELT))
@@ -367,13 +366,13 @@ IF (LRECYCLE) THEN
!
! *** Mean and fluctuations calculation
!
- IF(OR_COUNT.LE.XTMOY.AND.MOD(OR_COUNT,INT(XTMOYCOUNT))==0) THEN
- ICOUNT=OR_COUNT/XTMOYCOUNT
+ IF(ONR_COUNT.LE.XTMOY.AND.MOD(ONR_COUNT,INT(XTMOYCOUNT))==0) THEN
+ ICOUNT=ONR_COUNT/XTMOYCOUNT
XUMEANE(:,:,ICOUNT)=ZTMPUNE(:,:)
XVMEANE(:,:,ICOUNT)=ZTMPVTE(:,:)
XWMEANE(:,:,ICOUNT)=ZTMPWTE(:,:)
ENDIF
- IF(OR_COUNT.GT.XTMOY.AND.MOD(OR_COUNT,INT(XTMOYCOUNT))==0.AND.OPT_COUNT/=1) THEN
+ IF(ONR_COUNT.GT.XTMOY.AND.MOD(ONR_COUNT,INT(XTMOYCOUNT))==0.AND.OPT_COUNT/=1) THEN
DO JCOUNT=1,INT(XNUMBELT)-1
XUMEANE(:,:,JCOUNT)=XUMEANE(:,:,JCOUNT+1)
XVMEANE(:,:,JCOUNT)=XVMEANE(:,:,JCOUNT+1)
@@ -395,7 +394,7 @@ IF (LRECYCLE) THEN
ENDIF
ENDDO
ENDDO
- IF(R_COUNT.GT.XTMOY) THEN
+ IF(NR_COUNT.GT.XTMOY) THEN
ZTMPFUNE =ZTMPUNE(:,:)-(SUM(XUMEANE,DIM=3)/INT(XNUMBELT))
ZTMPFVTE =ZTMPVTE(:,:)-(SUM(XVMEANE,DIM=3)/INT(XNUMBELT))
ZTMPFWTE =ZTMPWTE(:,:)-(SUM(XWMEANE,DIM=3)/INT(XNUMBELT))
@@ -442,13 +441,13 @@ IF (LRECYCLS) THEN
!
! *** Mean and fluctuations calculation
!
- IF(OR_COUNT.LE.XTMOY.AND.MOD(OR_COUNT,INT(XTMOYCOUNT))==0) THEN
- ICOUNT=OR_COUNT/XTMOYCOUNT
+ IF(ONR_COUNT.LE.XTMOY.AND.MOD(ONR_COUNT,INT(XTMOYCOUNT))==0) THEN
+ ICOUNT=ONR_COUNT/XTMOYCOUNT
XUMEANS(:,:,ICOUNT)=ZTMPUTS(:,:)
XVMEANS(:,:,ICOUNT)=ZTMPVNS(:,:)
XWMEANS(:,:,ICOUNT)=ZTMPWTS(:,:)
ENDIF
- IF(OR_COUNT.GT.XTMOY.AND.MOD(OR_COUNT,INT(XTMOYCOUNT))==0.AND.OPT_COUNT/=1) THEN
+ IF(ONR_COUNT.GT.XTMOY.AND.MOD(ONR_COUNT,INT(XTMOYCOUNT))==0.AND.OPT_COUNT/=1) THEN
DO JCOUNT=1,INT(XNUMBELT)-1
XUMEANS(:,:,JCOUNT)=XUMEANS(:,:,JCOUNT+1)
XVMEANS(:,:,JCOUNT)=XVMEANS(:,:,JCOUNT+1)
@@ -470,7 +469,7 @@ IF (LRECYCLS) THEN
ENDIF
ENDDO
ENDDO
- IF(R_COUNT.GT.XTMOY) THEN
+ IF(NR_COUNT.GT.XTMOY) THEN
ZTMPFUTS =ZTMPUTS(:,:)-(SUM(XUMEANS,DIM=3)/INT(XNUMBELT))
ZTMPFVNS =ZTMPVNS(:,:)-(SUM(XVMEANS,DIM=3)/INT(XNUMBELT))
ZTMPFWTS =ZTMPWTS(:,:)-(SUM(XWMEANS,DIM=3)/INT(XNUMBELT))
diff --git a/src/MNH/recycling.f90 b/src/MNH/recycling.f90
index f9bbc1c8b..0cbc26c48 100644
--- a/src/MNH/recycling.f90
+++ b/src/MNH/recycling.f90
@@ -154,10 +154,10 @@ IF (PTCOUNT==1 .AND. INT(XTMOY)/INT(XTMOYCOUNT) /= INT(XNUMBELT)) THEN
END IF
IF(CCONF == "RESTA" .AND. PTCOUNT == 1 ) THEN
- R_COUNT = R_COUNT
+ NR_COUNT = NR_COUNT
ELSE
- R_COUNT = R_COUNT +1
- !IF (IP==1) WRITE(*,*)'RCOUNT: ', R_COUNT
+ NR_COUNT = NR_COUNT +1
+ !IF (IP==1) WRITE(*,*)'RCOUNT: ', NR_COUNT
ENDIF
IF (LRECYCLW) THEN
@@ -181,9 +181,9 @@ ENDIF
PMINS = 1+JPHEXT+JJDIST!
ENDIF
- CALL RECYCL_FLUC (XUT,XVT,XWT,XTHT,XDZZ,R_COUNT,PTCOUNT,PMINW,PMINN,PMINE,PMINS,&
- PFLUCTUNW,PFLUCTVNN,PFLUCTUTN,PFLUCTVTW,PFLUCTWTW,PFLUCTWTN,&
- PFLUCTUNE,PFLUCTVNS,PFLUCTUTS,PFLUCTVTE,PFLUCTWTE,PFLUCTWTS )
+ CALL RECYCL_FLUC (XUT,XVT,XWT,XTHT,XDZZ,NR_COUNT,PTCOUNT,PMINW,PMINN,PMINE,PMINS,&
+ PFLUCTUNW,PFLUCTVNN,PFLUCTUTN,PFLUCTVTW,PFLUCTWTW,PFLUCTWTN, &
+ PFLUCTUNE,PFLUCTVNS,PFLUCTUTS,PFLUCTVTE,PFLUCTWTE,PFLUCTWTS )
RETURN
diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index 5f90b18ce..4ea2182ae 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -518,7 +518,7 @@ IF (LRECYCL) THEN
TZFIELD%NDIMS = 0
TZFIELD%LTIMEDEP = .TRUE.
TZFIELD%CCOMMENT = 'Incremental counter for averaging purpose'
- CALL IO_Field_write(TPFILE,TZFIELD,R_COUNT)
+ CALL IO_Field_write(TPFILE,TZFIELD,NR_COUNT)
!
IF (LRECYCLW) THEN
TZFIELD%CMNHNAME = 'URECYCLW'
--
GitLab