From 467b5292287117cc3aa2ac4c3cbbdf5cb73f7aeb Mon Sep 17 00:00:00 2001
From: Gaelle DELAUTIER <gaelle.delautier@meteo.fr>
Date: Tue, 15 May 2018 14:18:40 +0200
Subject: [PATCH] S.Riette 15/5/2018 : ccall to condensation changed
---
src/MNH/ice_adjust_elec.f90 | 15 ++++++++++-----
src/MNH/radtr_satel.f90 | 10 +++++++---
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/MNH/ice_adjust_elec.f90 b/src/MNH/ice_adjust_elec.f90
index 00e4b04ed..8a0b414fc 100644
--- a/src/MNH/ice_adjust_elec.f90
+++ b/src/MNH/ice_adjust_elec.f90
@@ -1,8 +1,12 @@
-!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2014 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.
!-----------------------------------------------------------------
+!--------------- special set of characters for RCS information
+!-----------------------------------------------------------------
+! $Source$ $Revision$ $Date$
+!-----------------------------------------------------------------
! ###########################
MODULE MODI_ICE_ADJUST_ELEC
! ###########################
@@ -365,10 +369,11 @@ DO JITER = 1, ITERMAX
!
! ZW3=water vapor ZW1=rc (INOUT) ZW2=ri (INOUT) PSRC= s'rci'/Sigma_s^2
ZW3 = PRVS * PTSTEP; ZW1 = PRCS * PTSTEP; ZW2 = PRIS * PTSTEP
-
- CALL CONDENSATION( IIU, IJU, IKU, IIB, IIE, IJB, IJE, IKB, IKE,1, &
- PPABST, PZZ, ZT, ZW3, ZW1, ZW2, PSIGS, PMFCONV, PCLDFR, PSRCS, .TRUE., &
- OSIGMAS, PSIGQSAT )
+!
+ CALL CONDENSATION( IIU, IJU, IKU, IIB, IIE, IJB, IJE, IKB, IKE,1, 'T', &
+ PPABST, PZZ, ZT, ZW3, ZW1, ZW2, PRSS*PTSTEP, PRGS*PTSTEP, &
+ PSIGS, PMFCONV, PCLDFR, PSRCS, .TRUE., &
+ OSIGMAS, PSIGQSAT, PLV=ZLV, PLS=ZLS, PCPH=ZCPH )
!
!* 3.2 compute the variation of mixing ratio
!
diff --git a/src/MNH/radtr_satel.f90 b/src/MNH/radtr_satel.f90
index 354539240..394f11794 100644
--- a/src/MNH/radtr_satel.f90
+++ b/src/MNH/radtr_satel.f90
@@ -5,7 +5,7 @@
!-----------------------------------------------------------------
!--------------- special set of characters for RCS information
!-----------------------------------------------------------------
-! $Source$ $Revision$
+! $Source: /srv/cvsroot/MNH-VX-Y-Z/src/MNH/radtr_satel.f90,v $ $Revision: 1.2.4.1.16.1.2.2 $
!-----------------------------------------------------------------
! #######################
MODULE MODI_RADTR_SATEL
@@ -105,6 +105,7 @@ END MODULE MODI_RADTR_SATEL
!! J.-P. Chaboureau 15/04/03 add call to the subgrid condensation scheme
!! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
!! G.Delautier 04/2016 : BUG JPHEXT
+!! S. Riette 11/2016 : Condensation interface changed
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -258,6 +259,7 @@ REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZSIGRC ! s r_c / sig_s^2
REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZNCLD ! grid scale cloud fraction
REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZRC ! grid scale r_c mixing ratio (kg/kg)
REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZRI ! grid scale r_i (kg/kg)
+REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZRV ! grid scale r_v (kg/kg)
!----------------------------------------------------------------------------
!
!* 1. INITIALIZATION OF CONSTANTS FOR TRANSFERT CODE
@@ -475,8 +477,10 @@ IF( SIZE(PRT(:,:,:,:),4) >= 2 ) THEN
ALLOCATE(ZTEMP(IIU,IJU,IKU))
ZTEMP=PTHT*ZEXNT
ALLOCATE(ZSIGRC(IIU,IJU,IKU))
- CALL CONDENSATION( IIU, IJU, IKU, IIB, IIE, IJB, IJE, IKB, IKE,1,&
- PPABST, PZZ, ZTEMP, PRT(:,:,:,1), ZRC, ZRI, PSIGS, &
+ ALLOCATE(ZRV(IIU,IJU,IKU))
+ ZRV=PRT(:,:,:,1)
+ CALL CONDENSATION( IIU, IJU, IKU, IIB, IIE, IJB, IJE, IKB, IKE, 1, 'T',&
+ PPABST, PZZ, ZTEMP, ZRV, ZRC, ZRI, PRT(:,:,:,5), PRT(:,:,:,6), PSIGS,&
PMFCONV, ZNCLD, ZSIGRC, OUSERI, OSIGMAS,PSIGQSAT )
DEALLOCATE(ZTEMP,ZSIGRC)
ELSE
--
GitLab