Philippe 14/11/2016: minor: removed unused IO arguments
authorPhilippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Mon, 14 Nov 2016 09:47:26 +0000 (10:47 +0100)
committerPhilippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Mon, 14 Nov 2016 09:49:47 +0000 (10:49 +0100)
src/MNH/c3r5_adjust.f90
src/MNH/condsamp.f90
src/MNH/fast_terms.f90
src/MNH/ice_adjust.f90
src/MNH/ice_adjust_elec.f90
src/MNH/modeln.f90
src/MNH/phys_paramn.f90
src/MNH/resolved_cloud.f90
src/MNH/resolved_elecn.f90

index ce7ad34..2beef3f 100644 (file)
@@ -14,9 +14,9 @@
 !
 INTERFACE
 !
 !
 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,           &
                              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 
          !
 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
 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          
 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
 !
 !     ##########################################################################
 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,           &
                              PRVT, PRCT, PRRT, PRIT, PRST, PRGT, PRHT,         &
                              PRVS, PRCS, PRRS, PRIS, PRSS, PRGS, PRHS,         &
                              PCCT, PCIT, PCNUCS, PCCS, PINUCS, PCIS,           &
index 0715d15..22760ef 100644 (file)
 !
 INTERFACE
 !
 !
 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
 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
 !
 !
 END SUBROUTINE CONDSAMP
 !
@@ -32,8 +25,7 @@ END INTERFACE
 !
 END MODULE MODI_CONDSAMP
 !     ######spl
 !
 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
 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
 !
 !
 !*      0.2    declarations of local variables
 !
index a59af3c..3507eda 100644 (file)
@@ -14,9 +14,9 @@
 !
 INTERFACE
 !
 !
 INTERFACE
 !
-      SUBROUTINE FAST_TERMS( KRR, KMI, HFMFILE, HLUOUT, HRAD,           &
+      SUBROUTINE FAST_TERMS( KRR, KMI, HLUOUT, HRAD,                    &
                              HTURBDIM, HSCONV, HMF_CLOUD,               &
                              HTURBDIM, HSCONV, HMF_CLOUD,               &
-                             OCLOSE_OUT, OSUBG_COND, PTSTEP,            &
+                             OSUBG_COND, PTSTEP,                        &
                              PRHODJ, PSIGS, PPABST,                     &
                              PCF_MF,PRC_MF,                             &
                              PRVT, PRCT, PRVS, PRCS, PRRS,              &
                              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 
          !
 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
 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
 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          
 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
 !
 !     ##########################################################################
 END MODULE MODI_FAST_TERMS
 !
 !     ##########################################################################
-      SUBROUTINE FAST_TERMS( KRR, KMI, HFMFILE, HLUOUT, HRAD,           &
+      SUBROUTINE FAST_TERMS( KRR, KMI, HLUOUT, HRAD,                    &
                              HTURBDIM, HSCONV, HMF_CLOUD,               &
                              HTURBDIM, HSCONV, HMF_CLOUD,               &
-                             OCLOSE_OUT, OSUBG_COND, PTSTEP,            &
+                             OSUBG_COND, PTSTEP,                        &
                              PRHODJ, PSIGS, PPABST,                     &
                              PCF_MF,PRC_MF,                             &                   
                              PRVT, PRCT, PRVS, PRCS, PRRS,              &
                              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 
 !
 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
 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
 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          
 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 
 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
 !-------------------------------------------------------------------------------
 !
 !*       1.     PRELIMINARIES
index 243ded2..a04f634 100644 (file)
@@ -13,7 +13,7 @@
 !
 INTERFACE
 !
 !
 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,                            &
                              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 
 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
 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
 !
 !     ##########################################################################
 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,                             &
                              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 
 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
 CHARACTER*4,              INTENT(IN)    :: HTURBDIM ! Dimensionality of the
                                                     ! turbulence scheme
 CHARACTER*4,              INTENT(IN)    :: HRAD     ! Radiation scheme name
index dd9be12..4c7b2c6 100644 (file)
@@ -13,9 +13,8 @@
 !
 INTERFACE
 !
 !
 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 ,   &
                                   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 
 !
 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
 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: 
 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
 !
 !     ########################################################################
 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 ,   &
                              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 
 !
 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
 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: 
 LOGICAL,                INTENT(IN)    :: OSUBG_COND ! Switch for Subgrid 
                                                     ! Condensation
 LOGICAL                               :: OSIGMAS  ! Switch for Sigma_s: 
index 9cb3df5..3e2fc23 100644 (file)
@@ -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,             &
     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,                             &
                           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,             &
   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,                  &
                           XTSTEP, XZZ, XRHODJ, XRHODREF, XEXNREF,        &
                           XPABST, XTHT, XRTHS, XWT,                      &
                           XRT, XRRS, XSVT, XRSVS, XCIT,                  &
index 53a1a07..75ff6cb 100644 (file)
@@ -1201,7 +1201,7 @@ IF (LPASPOL) CALL PASPOL(XTSTEP, ZSFSV, ILUOUT, NVERB, OCLOSE_OUT, HFMFILE, CLUO
 !*        4b.  PASSIVE POLLUTANTS FOR MASS-FLUX SCHEME DIAGNOSTICS
 !              ---------------------------------------------------
 !
 !*        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)
 !
 !
 CALL SECOND_MNH2(ZTIME2)
 !
index b463a9c..e1fe834 100644 (file)
@@ -713,8 +713,8 @@ SELECT CASE ( HCLOUD )
 !*       4.     REVERSIBLE MICROPHYSICAL SCHEME
 !               -------------------------------
 !
 !*       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),                    &
                       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
 !
 !
 !*       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),                    &
                       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 )
 !*       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,                                    &   
                     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 )
 !*       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,                                    &                     
                     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
 !
 !
 !*       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),&
                        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),&
index 4c810d6..8baf1d6 100644 (file)
@@ -10,8 +10,8 @@
 INTERFACE
       SUBROUTINE RESOLVED_ELEC_n (HCLOUD, HSCONV, HMF_CLOUD,                              &
                                   KRR, KSPLITR, KMI, KTCOUNT, OEXIT,                      &
 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,                             & 
                                   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
 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
 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
 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,                      &
 !     #####################################################################################
       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,                             & 
                                   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
 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
 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
 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 )
 !*       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,                                  &
                           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),               &
                           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 )
 !*       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,                        &
                           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),               &
                           PRHODJ, PEXNREF, PSIGS, PPABST, ZZZ,                &
                           PMFCONV, PCF_MF, PRC_MF, PRI_MF,                    & 
                           PRVT=PRT(:,:,:,1), PRCT=PRT(:,:,:,2),               &