From 4db6b49776a40f2d40efc246d84951aad5f56160 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Mon, 14 Nov 2016 10:47:26 +0100
Subject: [PATCH] Philippe 14/11/2016: minor: removed unused IO arguments
---
src/MNH/c3r5_adjust.f90 | 17 ++++++-----------
src/MNH/condsamp.f90 | 18 ++----------------
src/MNH/fast_terms.f90 | 16 ++++------------
src/MNH/ice_adjust.f90 | 10 ++--------
src/MNH/ice_adjust_elec.f90 | 20 ++++----------------
src/MNH/modeln.f90 | 8 ++++----
src/MNH/phys_paramn.f90 | 2 +-
src/MNH/resolved_cloud.f90 | 18 +++++++++---------
src/MNH/resolved_elecn.f90 | 26 ++++++++------------------
9 files changed, 40 insertions(+), 95 deletions(-)
diff --git a/src/MNH/c3r5_adjust.f90 b/src/MNH/c3r5_adjust.f90
index ce7ad3480..2beef3f30 100644
--- a/src/MNH/c3r5_adjust.f90
+++ b/src/MNH/c3r5_adjust.f90
@@ -14,9 +14,9 @@
!
INTERFACE
!
- SUBROUTINE C3R5_ADJUST( KRR, KMI, HFMFILE, HLUOUT, HRAD, &
- HTURBDIM, OCLOSE_OUT, OSUBG_COND, PTSTEP, &
- PRHODREF, PRHODJ, PEXNREF, PSIGS, PPABST, &
+ SUBROUTINE C3R5_ADJUST( KRR, KMI, HRAD, &
+ HTURBDIM, OSUBG_COND, PTSTEP, &
+ PRHODREF, PRHODJ, PEXNREF, PSIGS, PPABST, &
PRVT, PRCT, PRRT, PRIT, PRST, PRGT, PRHT, &
PRVS, PRCS, PRRS, PRIS, PRSS, PRGS, PRHS, &
PCCT, PCIT, PCNUCS, PCCS, PINUCS, PCIS, &
@@ -24,14 +24,9 @@ INTERFACE
!
INTEGER, INTENT(IN) :: KRR ! Number of moist variables
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
! turbulence scheme
CHARACTER*4, 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
! Condensation
REAL, INTENT(IN) :: PTSTEP ! Time step
@@ -79,9 +74,9 @@ END INTERFACE
END MODULE MODI_C3R5_ADJUST
!
! ##########################################################################
- SUBROUTINE C3R5_ADJUST( KRR, KMI, HFMFILE, HLUOUT, HRAD, &
- HTURBDIM, OCLOSE_OUT, OSUBG_COND, PTSTEP, &
- PRHODREF, PRHODJ, PEXNREF, PSIGS, PPABST, &
+ SUBROUTINE C3R5_ADJUST( KRR, KMI, HRAD, &
+ HTURBDIM, OSUBG_COND, PTSTEP, &
+ PRHODREF, PRHODJ, PEXNREF, PSIGS, PPABST, &
PRVT, PRCT, PRRT, PRIT, PRST, PRGT, PRHT, &
PRVS, PRCS, PRRS, PRIS, PRSS, PRGS, PRHS, &
PCCT, PCIT, PCNUCS, PCCS, PINUCS, PCIS, &
diff --git a/src/MNH/condsamp.f90 b/src/MNH/condsamp.f90
index 0715d151e..22760eff2 100644
--- a/src/MNH/condsamp.f90
+++ b/src/MNH/condsamp.f90
@@ -13,18 +13,11 @@
!
INTERFACE
!
- SUBROUTINE CONDSAMP (PSFSV, KLUOUT, KVERB, OCLOSE_OUT, &
- HFMFILE, HLUOUT)
+ SUBROUTINE CONDSAMP (PSFSV, KLUOUT, KVERB)
IMPLICIT NONE
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSFSV ! surface flux of scalars
INTEGER, INTENT(IN) :: KLUOUT ! unit for output listing count
INTEGER, INTENT(IN) :: KVERB ! verbosity level
-LOGICAL, INTENT(IN) :: OCLOSE_OUT! conditional closure of the
- ! OUTPUT FM-file
-CHARACTER(LEN=*), INTENT(IN) :: HFMFILE ! Name of the output
- ! FM-file
-CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for
- ! model n
!
END SUBROUTINE CONDSAMP
!
@@ -32,8 +25,7 @@ END INTERFACE
!
END MODULE MODI_CONDSAMP
! ######spl
- SUBROUTINE CONDSAMP (PSFSV, KLUOUT, KVERB, OCLOSE_OUT, &
- HFMFILE, HLUOUT)
+ SUBROUTINE CONDSAMP (PSFSV, KLUOUT, KVERB)
! ############################################################
!
!
@@ -85,12 +77,6 @@ IMPLICIT NONE
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PSFSV ! surface flux of scalars
INTEGER, INTENT(IN) :: KLUOUT ! unit for output listing count
INTEGER, INTENT(IN) :: KVERB ! verbosity level
-LOGICAL, INTENT(IN) :: OCLOSE_OUT! conditional closure of the
- ! OUTPUT FM-file
-CHARACTER(LEN=*), INTENT(IN) :: HFMFILE ! Name of the output
- ! FM-file
-CHARACTER(LEN=*), INTENT(IN) :: HLUOUT ! Output-listing name for
- ! model n
!
!* 0.2 declarations of local variables
!
diff --git a/src/MNH/fast_terms.f90 b/src/MNH/fast_terms.f90
index a59af3ccb..3507eda6f 100644
--- a/src/MNH/fast_terms.f90
+++ b/src/MNH/fast_terms.f90
@@ -14,9 +14,9 @@
!
INTERFACE
!
- SUBROUTINE FAST_TERMS( KRR, KMI, HFMFILE, HLUOUT, HRAD, &
+ SUBROUTINE FAST_TERMS( KRR, KMI, HLUOUT, HRAD, &
HTURBDIM, HSCONV, HMF_CLOUD, &
- OCLOSE_OUT, OSUBG_COND, PTSTEP, &
+ OSUBG_COND, PTSTEP, &
PRHODJ, PSIGS, PPABST, &
PCF_MF,PRC_MF, &
PRVT, PRCT, PRVS, PRCS, PRRS, &
@@ -24,7 +24,6 @@ INTERFACE
!
INTEGER, INTENT(IN) :: KRR ! Number of moist variables
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
@@ -32,8 +31,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! Dimensionality of the
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
-LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of
- ! the OUTPUT FM-file
LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for Subgrid
! Condensation
REAL, INTENT(IN) :: PTSTEP ! Time step
@@ -66,9 +63,9 @@ END INTERFACE
END MODULE MODI_FAST_TERMS
!
! ##########################################################################
- SUBROUTINE FAST_TERMS( KRR, KMI, HFMFILE, HLUOUT, HRAD, &
+ SUBROUTINE FAST_TERMS( KRR, KMI, HLUOUT, HRAD, &
HTURBDIM, HSCONV, HMF_CLOUD, &
- OCLOSE_OUT, OSUBG_COND, PTSTEP, &
+ OSUBG_COND, PTSTEP, &
PRHODJ, PSIGS, PPABST, &
PCF_MF,PRC_MF, &
PRVT, PRCT, PRVS, PRCS, PRRS, &
@@ -183,7 +180,6 @@ IMPLICIT NONE
!
INTEGER, INTENT(IN) :: KRR ! Number of moist variables
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
@@ -191,8 +187,6 @@ CHARACTER*4, INTENT(IN) :: HTURBDIM ! Dimensionality of the
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
-LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of
- ! the OUTPUT FM-file
LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for Subgrid
! Condensation
REAL, INTENT(IN) :: PTSTEP ! Time step
@@ -239,8 +233,6 @@ INTEGER :: ILENCH ! Length of comment string in LFIFM file
INTEGER :: JK ! Var for vertical DO loops
INTEGER :: JITER,ITERMAX ! iterative loop for first order adjustment
INTEGER :: ILUOUT ! Logical unit of output listing
-CHARACTER (LEN=100) :: YCOMMENT ! Comment string in LFIFM file
-CHARACTER (LEN=16) :: YRECFM ! Name of the desired field in LFIFM file
!-------------------------------------------------------------------------------
!
!* 1. PRELIMINARIES
diff --git a/src/MNH/ice_adjust.f90 b/src/MNH/ice_adjust.f90
index 243ded20a..a04f63482 100644
--- a/src/MNH/ice_adjust.f90
+++ b/src/MNH/ice_adjust.f90
@@ -13,7 +13,7 @@
!
INTERFACE
!
- SUBROUTINE ICE_ADJUST (KKA, KKU, KKL, KRR, KMI, HFMFILE, HLUOUT, HRAD, &
+ SUBROUTINE ICE_ADJUST (KKA, KKU, KKL, KRR, KMI, HRAD, &
HTURBDIM, OSUBG_COND, OSIGMAS, PTSTEP, PSIGQSAT, &
PRHODJ, PEXNREF, PSIGS,PMFCONV,PPABST,PZZ, &
PCF_MF,PRC_MF, PRI_MF, &
@@ -26,9 +26,6 @@ INTEGER, INTENT(IN) :: KKU !uppest atmosphere array index
INTEGER, INTENT(IN) :: KKL !vert. levels type 1=MNH -1=ARO
INTEGER, INTENT(IN) :: KRR ! Number of moist variables
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
! turbulence scheme
CHARACTER*4, INTENT(IN) :: HRAD ! Radiation scheme name
@@ -81,7 +78,7 @@ END INTERFACE
END MODULE MODI_ICE_ADJUST
!
! ##########################################################################
- SUBROUTINE ICE_ADJUST (KKA, KKU, KKL, KRR, KMI, HFMFILE, HLUOUT, HRAD, &
+ SUBROUTINE ICE_ADJUST (KKA, KKU, KKL, KRR, KMI, HRAD, &
HTURBDIM, OSUBG_COND, OSIGMAS, PTSTEP, PSIGQSAT, &
PRHODJ, PEXNREF, PSIGS,PMFCONV,PPABST,PZZ, &
PCF_MF,PRC_MF,PRI_MF, &
@@ -191,9 +188,6 @@ INTEGER, INTENT(IN) :: KKU !uppest atmosphere array index
INTEGER, INTENT(IN) :: KKL !vert. levels type 1=MNH -1=ARO
INTEGER, INTENT(IN) :: KRR ! Number of moist variables
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
! turbulence scheme
CHARACTER*4, INTENT(IN) :: HRAD ! Radiation scheme name
diff --git a/src/MNH/ice_adjust_elec.f90 b/src/MNH/ice_adjust_elec.f90
index dd9be1207..4c7b2c622 100644
--- a/src/MNH/ice_adjust_elec.f90
+++ b/src/MNH/ice_adjust_elec.f90
@@ -13,9 +13,8 @@
!
INTERFACE
!
- SUBROUTINE ICE_ADJUST_ELEC (KRR, KMI, HFMFILE, HLUOUT, HRAD, &
- HTURBDIM, HSCONV, HMF_CLOUD, &
- OCLOSE_OUT, OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT,&
+ SUBROUTINE ICE_ADJUST_ELEC (KRR, KMI, HRAD, HTURBDIM, HSCONV, HMF_CLOUD, &
+ OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT, &
PRHODJ, PEXNREF, PSIGS, PPABST, PZZ, &
PMFCONV, PCF_MF, PRC_MF, PRI_MF, &
PRVT, PRCT, PRVS, PRCS, PTHS, PSRCS, PCLDFR , &
@@ -26,16 +25,11 @@ INTERFACE
!
INTEGER, INTENT(IN) :: KRR ! Number of moist variables
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
! 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
-LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of
- ! the OUTPUT FM-file
LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for Subgrid
! Condensation
LOGICAL :: OSIGMAS ! Switch for Sigma_s:
@@ -99,9 +93,8 @@ END INTERFACE
END MODULE MODI_ICE_ADJUST_ELEC
!
! ########################################################################
- SUBROUTINE ICE_ADJUST_ELEC (KRR, KMI, HFMFILE, HLUOUT, HRAD, &
- HTURBDIM, HSCONV, HMF_CLOUD, &
- OCLOSE_OUT, OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT,&
+ SUBROUTINE ICE_ADJUST_ELEC (KRR, KMI, HRAD, HTURBDIM, HSCONV, &
+ HMF_CLOUD, OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT,&
PRHODJ, PEXNREF, PSIGS, PPABST, PZZ, &
PMFCONV, PCF_MF, PRC_MF, PRI_MF, &
PRVT, PRCT, PRVS, PRCS, PTHS, PSRCS, PCLDFR , &
@@ -202,16 +195,11 @@ IMPLICIT NONE
!
INTEGER, INTENT(IN) :: KRR ! Number of moist variables
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
! 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
-LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of
- ! the OUTPUT FM-file
LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for Subgrid
! Condensation
LOGICAL :: OSIGMAS ! Switch for Sigma_s:
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index 9cb3df58f..3e2fc2332 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -1785,8 +1785,8 @@ IF (CELEC /= 'NONE' .AND. (CCLOUD(1:3) == 'ICE')) THEN
CALL MNHGET_SURF_PARAM_n (PSEA=ZSEA(:,:),PTOWN=ZTOWN(:,:))
CALL RESOLVED_ELEC_n (CCLOUD, CSCONV, CMF_CLOUD, &
NRR, NSPLITR, IMI, KTCOUNT, OEXIT, &
- CLBCX, CLBCY, YFMFILE, CLUOUT, CRAD, CTURBDIM, &
- GCLOSE_OUT, LSUBG_COND, LSIGMAS,VSIGQSAT,CSUBG_AUCV, &
+ CLBCX, CLBCY, CRAD, CTURBDIM, &
+ LSUBG_COND, LSIGMAS,VSIGQSAT,CSUBG_AUCV, &
XTSTEP, XZZ, XRHODJ, XRHODREF, XEXNREF, &
XPABST, XTHT, XRTHS, XWT, XRT, XRRS, &
XSVT, XRSVS, XCIT, &
@@ -1799,8 +1799,8 @@ IF (CELEC /= 'NONE' .AND. (CCLOUD(1:3) == 'ICE')) THEN
ELSE
CALL RESOLVED_ELEC_n (CCLOUD, CSCONV, CMF_CLOUD, &
NRR, NSPLITR, IMI, KTCOUNT, OEXIT, &
- CLBCX, CLBCY, YFMFILE, CLUOUT, CRAD, CTURBDIM, &
- GCLOSE_OUT, LSUBG_COND, LSIGMAS,VSIGQSAT, CSUBG_AUCV, &
+ CLBCX, CLBCY, CRAD, CTURBDIM, &
+ LSUBG_COND, LSIGMAS,VSIGQSAT, CSUBG_AUCV, &
XTSTEP, XZZ, XRHODJ, XRHODREF, XEXNREF, &
XPABST, XTHT, XRTHS, XWT, &
XRT, XRRS, XSVT, XRSVS, XCIT, &
diff --git a/src/MNH/phys_paramn.f90 b/src/MNH/phys_paramn.f90
index 53a1a07b3..75ff6cb68 100644
--- a/src/MNH/phys_paramn.f90
+++ b/src/MNH/phys_paramn.f90
@@ -1201,7 +1201,7 @@ IF (LPASPOL) CALL PASPOL(XTSTEP, ZSFSV, ILUOUT, NVERB, OCLOSE_OUT, HFMFILE, CLUO
!* 4b. PASSIVE POLLUTANTS FOR MASS-FLUX SCHEME DIAGNOSTICS
! ---------------------------------------------------
!
-IF (LCONDSAMP) CALL CONDSAMP(ZSFSV, ILUOUT, NVERB, OCLOSE_OUT, HFMFILE, CLUOUT)
+IF (LCONDSAMP) CALL CONDSAMP(ZSFSV, ILUOUT, NVERB)
!
CALL SECOND_MNH2(ZTIME2)
!
diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90
index b463a9c4b..e1fe834b6 100644
--- a/src/MNH/resolved_cloud.f90
+++ b/src/MNH/resolved_cloud.f90
@@ -713,8 +713,8 @@ SELECT CASE ( HCLOUD )
!* 4. REVERSIBLE MICROPHYSICAL SCHEME
! -------------------------------
!
- CALL FAST_TERMS ( KRR, KMI, HFMFILE, HLUOUT, HRAD, HTURBDIM, &
- HSCONV, HMF_CLOUD, OCLOSE_OUT, OSUBG_COND, PTSTEP, &
+ CALL FAST_TERMS ( KRR, KMI, HLUOUT, HRAD, HTURBDIM, &
+ HSCONV, HMF_CLOUD, OSUBG_COND, PTSTEP, &
PRHODJ, PSIGS, PPABST, &
PCF_MF,PRC_MF, &
PRVT=PRT(:,:,:,1), PRCT=PRT(:,:,:,2), &
@@ -737,8 +737,8 @@ SELECT CASE ( HCLOUD )
!
!* 5.2 Perform the saturation adjustment
!
- CALL FAST_TERMS ( KRR, KMI, HFMFILE, HLUOUT, HRAD, HTURBDIM, &
- HSCONV, HMF_CLOUD, OCLOSE_OUT, OSUBG_COND, PTSTEP, &
+ CALL FAST_TERMS ( KRR, KMI, HLUOUT, HRAD, HTURBDIM, &
+ HSCONV, HMF_CLOUD, OSUBG_COND, PTSTEP, &
PRHODJ, PSIGS, PPABST, &
PCF_MF,PRC_MF, &
PRVT=PRT(:,:,:,1), PRCT=PRT(:,:,:,2), &
@@ -814,7 +814,7 @@ SELECT CASE ( HCLOUD )
!* 9.2 Perform the saturation adjustment over cloud ice and cloud water
!
ZZZ = MZF(1,IKU,1, PZZ )
- CALL ICE_ADJUST (1,IKU,1, KRR, KMI, HFMFILE, HLUOUT, HRAD, HTURBDIM, &
+ CALL ICE_ADJUST (1,IKU,1, KRR, KMI, HRAD, HTURBDIM, &
OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT, &
PRHODJ, PEXNREF, PSIGS, PMFCONV, PPABST, ZZZ, &
PCF_MF,PRC_MF,PRI_MF, &
@@ -856,7 +856,7 @@ SELECT CASE ( HCLOUD )
!* 10.2 Perform the saturation adjustment over cloud ice and cloud water
!
ZZZ = MZF(1,IKU,1, PZZ )
- CALL ICE_ADJUST (1,IKU,1, KRR, KMI, HFMFILE, HLUOUT, HRAD, HTURBDIM, &
+ CALL ICE_ADJUST (1,IKU,1, KRR, KMI, HRAD, HTURBDIM, &
OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT, &
PRHODJ, PEXNREF, PSIGS, PMFCONV, PPABST, ZZZ, &
PCF_MF,PRC_MF,PRI_MF, &
@@ -905,9 +905,9 @@ SELECT CASE ( HCLOUD )
!
!* 11.2 Perform the saturation adjustment
!
- CALL C3R5_ADJUST ( KRR, KMI, HFMFILE, HLUOUT, HRAD, &
- HTURBDIM, OCLOSE_OUT, OSUBG_COND, PTSTEP, &
- PRHODREF, PRHODJ, PEXNREF, PSIGS, PPABST, &
+ CALL C3R5_ADJUST ( KRR, KMI, HRAD, &
+ HTURBDIM, OSUBG_COND, PTSTEP, &
+ PRHODREF, PRHODJ, PEXNREF, PSIGS, PPABST, &
PRVT=PRT(:,:,:,1), PRCT=PRT(:,:,:,2), PRRT=PRT(:,:,:,3),&
PRIT=PRT(:,:,:,4), PRST=PRT(:,:,:,5), PRGT=PRT(:,:,:,6),&
PRVS=PRS(:,:,:,1), PRCS=PRS(:,:,:,2), PRRS=PRS(:,:,:,3),&
diff --git a/src/MNH/resolved_elecn.f90 b/src/MNH/resolved_elecn.f90
index 4c810d6a3..8baf1d61e 100644
--- a/src/MNH/resolved_elecn.f90
+++ b/src/MNH/resolved_elecn.f90
@@ -10,8 +10,8 @@
INTERFACE
SUBROUTINE RESOLVED_ELEC_n (HCLOUD, HSCONV, HMF_CLOUD, &
KRR, KSPLITR, KMI, KTCOUNT, OEXIT, &
- HLBCX, HLBCY, HFMFILE, HLUOUT, HRAD, HTURBDIM, &
- OCLOSE_OUT, OSUBG_COND, OSIGMAS,PSIGQSAT, HSUBG_AUCV, &
+ HLBCX, HLBCY, HRAD, HTURBDIM, &
+ OSUBG_COND, OSIGMAS,PSIGQSAT, HSUBG_AUCV, &
PTSTEP, PZZ, PRHODJ, PRHODREF, PEXNREF, &
PPABST, PTHT, PTHS, PWT, &
PRT, PRS, PSVT, PSVS, PCIT, &
@@ -31,14 +31,9 @@ INTEGER, INTENT(IN) :: KMI ! Model index
INTEGER, INTENT(IN) :: KTCOUNT ! Temporal loop counter
LOGICAL, INTENT(IN) :: OEXIT ! switch for the end of the temporal loop
CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY ! X and Y-direc. LBC type
-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) :: HRAD ! Radiation scheme name
CHARACTER*4, INTENT(IN) :: HTURBDIM ! Dimensionality of the
! turbulence scheme
-LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of
- ! the OUTPUT FM-file
LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for Subgrid Cond.
LOGICAL, INTENT(IN) :: OSIGMAS ! Switch for Sigma_s:
! use values computed in CONDENSATION
@@ -102,8 +97,8 @@ END MODULE MODI_RESOLVED_ELEC_n
! #####################################################################################
SUBROUTINE RESOLVED_ELEC_n (HCLOUD, HSCONV, HMF_CLOUD, &
KRR, KSPLITR, KMI, KTCOUNT, OEXIT, &
- HLBCX, HLBCY, HFMFILE, HLUOUT, HRAD, HTURBDIM, &
- OCLOSE_OUT, OSUBG_COND, OSIGMAS,PSIGQSAT, HSUBG_AUCV, &
+ HLBCX, HLBCY, HRAD, HTURBDIM, &
+ OSUBG_COND, OSIGMAS,PSIGQSAT, HSUBG_AUCV, &
PTSTEP, PZZ, PRHODJ, PRHODREF, PEXNREF, &
PPABST, PTHT, PTHS, PWT, &
PRT, PRS, PSVT, PSVS, PCIT, &
@@ -229,14 +224,9 @@ INTEGER, INTENT(IN) :: KMI ! Model index
INTEGER, INTENT(IN) :: KTCOUNT ! Temporal loop counter
LOGICAL, INTENT(IN) :: OEXIT ! switch for the end of the temporal loop
CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY ! X and Y-direc. LBC type
-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) :: HRAD ! Radiation scheme name
CHARACTER*4, INTENT(IN) :: HTURBDIM ! Dimensionality of the
! turbulence scheme
-LOGICAL, INTENT(IN) :: OCLOSE_OUT ! Conditional closure of
- ! the OUTPUT FM-file
LOGICAL, INTENT(IN) :: OSUBG_COND ! Switch for Subgrid Cond.
LOGICAL, INTENT(IN) :: OSIGMAS ! Switch for Sigma_s:
! use values computed in CONDENSATION
@@ -696,9 +686,9 @@ SELECT CASE (HCLOUD)
!* 5.2 Perform the saturation adjustment over cloud ice and cloud water
!
ZZZ = MZF(1,IKU,1, PZZ )
- CALL ICE_ADJUST_ELEC (KRR, KMI, HFMFILE, HLUOUT, HRAD, HTURBDIM, &
+ CALL ICE_ADJUST_ELEC (KRR, KMI, HRAD, HTURBDIM, &
HSCONV, HMF_CLOUD, &
- OCLOSE_OUT, OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT, &
+ OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT, &
PRHODJ, PEXNREF, PSIGS, PPABST, ZZZ, &
PMFCONV, PCF_MF, PRC_MF, PRI_MF, &
PRVT=PRT(:,:,:,1), PRCT=PRT(:,:,:,2), &
@@ -760,9 +750,9 @@ SELECT CASE (HCLOUD)
!* 6.2 Perform the saturation adjustment over cloud ice and cloud water
!
ZZZ = MZF(1,IKU,1, PZZ )
- CALL ICE_ADJUST_ELEC (KRR, KMI, HFMFILE, HLUOUT, HRAD, &
+ CALL ICE_ADJUST_ELEC (KRR, KMI, HRAD, &
HTURBDIM, HSCONV, HMF_CLOUD, &
- OCLOSE_OUT,OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT, &
+ OSUBG_COND, OSIGMAS, PTSTEP,PSIGQSAT, &
PRHODJ, PEXNREF, PSIGS, PPABST, ZZZ, &
PMFCONV, PCF_MF, PRC_MF, PRI_MF, &
PRVT=PRT(:,:,:,1), PRCT=PRT(:,:,:,2), &
--
GitLab