Skip to content
Snippets Groups Projects
Commit d5c098b9 authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 10/03/2020: small changes

* change intent of several dummy arguments
* transform several arrays into allocatable
* remove unused dummy arguments
parent dce38acf
No related branches found
No related tags found
No related merge requests found
!MNH_LIC Copyright 2007-2019 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 2007-2020 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
......@@ -94,7 +94,7 @@ REAL, INTENT(IN) :: PRTMIN_AQ ! LWC threshold liq. chem.
!
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF! Reference density
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRRS ! water m.r. source
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRRS ! water m.r. source
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRSVS ! S.V. source
!
INTEGER, INTENT(IN) :: KRRL ! Number of liq. variables
......
!MNH_LIC Copyright 2008-2019 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 2008-2020 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
......@@ -23,7 +23,7 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODJ ! Dry density * Jacobian
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRRT ! Rain water m.r. at t
REAL, DIMENSION(:,:,:), INTENT(IN) :: PRRS ! Rain water m.r. source
REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRT ! Rain water C at t
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PCRS ! Rain water C. source
REAL, DIMENSION(:,:,:), INTENT(IN) :: PCRS ! Rain water C. source
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PSVT ! Precip. aq. species at t
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRSVS ! Precip. aq. species source
REAL, DIMENSION(:,:), INTENT(OUT) :: PINPRR ! instantaneaous precip.
......
......@@ -390,8 +390,8 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZRV, ZDENAIR, ZPRESSURE, ZTEMP, ZRC
REAL, DIMENSION(:,:), ALLOCATABLE :: ZRHOP0, ZOM, ZSOLORG
REAL, DIMENSION(:), ALLOCATABLE :: ZLAMBDA, ZMU, ZSO4RAT
REAL,DIMENSION(SIZE(XSVT,1),SIZE(XSVT,2),SIZE(XSVT,3),SIZE(XSVT,4)) :: ZSVT
REAL,DIMENSION(SIZE(XSVT,1),SIZE(XSVT,2),SIZE(XSVT,3),NSV_AER) :: ZCWETAERO
REAL,DIMENSION(:,:,:,:), ALLOCATABLE :: ZSVT
REAL,DIMENSION(:,:,:,:), ALLOCATABLE :: ZCWETAERO
!
!-------------------------------------------------------------------------------
! variables for AQueous/NAQueous cases
......@@ -608,6 +608,7 @@ ZDTSOLVER = PTSTEP / NCH_SUBSTEPS
!
!
IF (LORILAM) THEN
ALLOCATE( ZSVT(SIZE(XSVT,1),SIZE(XSVT,2),SIZE(XSVT,3),SIZE(XSVT,4)) )
DO JSV = 1, SIZE(XSVT,4)
ZSVT(:,:,:,JSV) = XRSVS(:,:,:,JSV) *PTSTEP / XRHODJ(:,:,:)
......@@ -744,6 +745,7 @@ IF (LORILAM) THEN
ENDIF
! implicit wet deposition
IF ((LCH_CONV_SCAV).AND.(CPROGRAM/='DIAG ')) THEN
ALLOCATE( ZCWETAERO(SIZE(XSVT,1),SIZE(XSVT,2),SIZE(XSVT,3),NSV_AER) )
DO JN=1,NSV_AER
ZCWETAERO(:,:,:,JN) = (XRSVS(:,:,:,JN+NSV_AERBEG-1)+PWETDEPAER(:,:,:,JN))*PTSTEP / XRHODJ(:,:,:)
END DO
......@@ -752,6 +754,7 @@ IF (LORILAM) THEN
CALL CH_AER_WETDEP_n(PTSTEP, ZSVT(IIB:IIE,IJB:IJE,IKB:IKE,NSV_AERBEG:NSV_AEREND), &
ZCWETAERO(IIB:IIE,IJB:IJE,IKB:IKE,:), XRHODREF(IIB:IIE,IJB:IJE,IKB:IKE), &
XSEDA(IIB:IIE,IJB:IJE,IKB:IKE,:))
DEALLOCATE( ZCWETAERO )
ENDIF
! explicit wet deposition
IF ((LDEPOS_AER(IMI)).AND.(CPROGRAM/='DIAG ')) THEN
......@@ -773,6 +776,8 @@ IF (LORILAM) THEN
DO JSV = 1, SIZE(XSVT,4)
XRSVS(:,:,:,JSV) = ZSVT(:,:,:,JSV) * XRHODJ(:,:,:) / PTSTEP
END DO
DEALLOCATE( ZSVT )
ENDIF
!
!* 3.2 check where aqueous concentration>0 + micropĥysics term
......
......@@ -12,7 +12,7 @@ INTERFACE
SUBROUTINE DRAG_VEG(PTSTEP,PUT,PVT,PTKET,ODEPOTREE, PVDEPOTREE, &
HCLOUD,PPABST,PTHT,PRT,PSVT, &
PRHODJ,PZZ,PRUS, PRVS, PRTKES, &
PTHS,PRRS,PSVS)
PRRS,PSVS)
!
REAL, INTENT(IN) :: PTSTEP ! Time step
REAL, DIMENSION(:,:,:), INTENT(IN) :: PUT, PVT ! variables
......@@ -34,7 +34,6 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRUS, PRVS ! Sources of Momentu
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRTKES ! Sources of Tke
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRRS
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PSVS
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PTHS
!
!
......@@ -48,7 +47,7 @@ END MODULE MODI_DRAG_VEG
SUBROUTINE DRAG_VEG(PTSTEP,PUT,PVT,PTKET,ODEPOTREE, PVDEPOTREE, &
HCLOUD,PPABST,PTHT,PRT,PSVT, &
PRHODJ,PZZ,PRUS, PRVS, PRTKES, &
PTHS,PRRS,PSVS)
PRRS,PSVS)
! ###################################################################
!
!!**** *DRAG_VEG_n * -
......@@ -123,7 +122,6 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRUS, PRVS ! Sources of Momentu
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRTKES ! Sources of Tke
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRRS
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PSVS
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PTHS
!
!
!* 0.2 Declarations of local variables :
......
This diff is collapsed.
......@@ -1239,7 +1239,7 @@ XTIME_LES_BU_PROCESS = 0.
IF (LDRAGTREE) CALL DRAG_VEG(XTSTEP,XUT,XVT,XTKET,LDEPOTREE,XVDEPOTREE, &
CCLOUD, XPABST,XTHT,XRT,XSVT, &
XRHODJ,XZZ,XRUS, XRVS, &
XRTKES,XRTHS, XRRS,XRSVS)
XRTKES, XRRS,XRSVS)
!
CALL SECOND_MNH2(ZTIME2)
!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment