From 5e27729f82aaa66b59cda24ebe8157863ff78655 Mon Sep 17 00:00:00 2001
From: ESCOBAR Juan <escj@nuwa>
Date: Wed, 12 Nov 2014 17:03:40 +0100
Subject: [PATCH] Juan 12/11/2014: manage correctly IIB,IIE etc
---
MNH/fast_terms.f90 | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/MNH/fast_terms.f90 b/MNH/fast_terms.f90
index 5e4dbc6a2..01493a4af 100644
--- a/MNH/fast_terms.f90
+++ b/MNH/fast_terms.f90
@@ -27,11 +27,11 @@ INTEGER, INTENT(IN) :: KMI ! Model index
CHARACTER(LEN=*), INTENT(IN) :: HFMFILE ! Name of the output FM-file
CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for
! model n
-CHARACTER*4, INTENT(IN) :: HTURBDIM ! Dimensionality of the
+CHARACTER(LEN=*), INTENT(IN) :: HTURBDIM ! Dimensionality of the
! turbulence scheme
-CHARACTER(LEN=4), INTENT(IN) :: HSCONV ! Shallow convection scheme
-CHARACTER(LEN=4), INTENT(IN) :: HMF_CLOUD! Type of statistical cloud
-CHARACTER*4, INTENT(IN) :: HRAD ! Radiation scheme name
+CHARACTER(LEN=*), INTENT(IN) :: HSCONV ! Shallow convection scheme
+CHARACTER(LEN=*), INTENT(IN) :: HMF_CLOUD! Type of statistical cloud
+CHARACTER(LEN=*), INTENT(IN) :: HRAD ! Radiation scheme name
LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of
! the OUTPUT FM-file
LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for Subgrid
@@ -50,8 +50,8 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRCS ! Cloud water m.r. source
REAL, DIMENSION(:,:,:), OPTIONAL, INTENT(IN) :: PRRS ! Rain water m.r. source
!
!
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PCF_MF! Convective Mass Flux Cloud fraction
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PRC_MF! Convective Mass Flux liquid mixing ratio
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PCF_MF! Convective Mass Flux Cloud fraction
+REAL, DIMENSION(:,:,:), INTENT(IN) :: PRC_MF! Convective Mass Flux liquid mixing ratio
!
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PTHS ! Theta source
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PSRCS ! Second-order flux
@@ -183,11 +183,11 @@ INTEGER, INTENT(IN) :: KMI ! Model index
CHARACTER(LEN=*), INTENT(IN) :: HFMFILE ! Name of the output FM-file
CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for
! model n
-CHARACTER*4, INTENT(IN) :: HTURBDIM ! Dimensionality of the
+CHARACTER(LEN=*), INTENT(IN) :: HTURBDIM ! Dimensionality of the
! turbulence scheme
-CHARACTER(LEN=4), INTENT(IN) :: HSCONV ! Shallow convection scheme
-CHARACTER(LEN=4), INTENT(IN) :: HMF_CLOUD! Type of statistical cloud
-CHARACTER*4, INTENT(IN) :: HRAD ! Radiation scheme name
+CHARACTER(LEN=*), INTENT(IN) :: HSCONV ! Shallow convection scheme
+CHARACTER(LEN=*), INTENT(IN) :: HMF_CLOUD! Type of statistical cloud
+CHARACTER(LEN=*), INTENT(IN) :: HRAD ! Radiation scheme name
LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of
! the OUTPUT FM-file
LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for Subgrid
@@ -233,11 +233,6 @@ INTEGER :: IRESP ! Return code of FM routines
INTEGER :: ILENG ! Length of comment string in LFIFM file
INTEGER :: IGRID ! C-grid indicator in LFIFM file
INTEGER :: ILENCH ! Length of comment string in LFIFM file
-INTEGER :: IKB ! K index value of the first inner mass point
-INTEGER :: IKE ! K index value of the last inner mass point
-INTEGER :: IIB,IJB ! Horz index values of the first inner mass points
-INTEGER :: IIE,IJE ! Horz index values of the last inner mass points
-INTEGER :: IPLAN ! Number of horz inner points
INTEGER :: JK ! Var for vertical DO loops
INTEGER :: JITER,ITERMAX ! iterative loop for first order adjustment
INTEGER :: ILUOUT ! Logical unit of output listing
@@ -249,14 +244,6 @@ CHARACTER (LEN=16) :: YRECFM ! Name of the desired field in LFIFM file
! -------------
!
CALL FMLOOK_ll(HLUOUT,HLUOUT,ILUOUT,IRESP)
-!!$IIB = 1 + JPHEXT
-!!$IIE = SIZE(PRHODJ,1) - JPHEXT
-!!$IJB = 1 + JPHEXT
-!!$IJE = SIZE(PRHODJ,2) - JPHEXT
-CALL GET_INDICE_ll (IIB,IJB,IIE,IJE)
-IPLAN = (SIZE(PRHODJ,1)-2*JPHEXT)*(SIZE(PRHODJ,2)-2*JPHEXT)
-IKB = 1 + JPVEXT
-IKE = SIZE(PRHODJ,3) - JPVEXT
ZEPS= XMV / XMD
!
IF (OSUBG_COND) THEN
--
GitLab