diff --git a/src/MNH/lidar.f90 b/src/MNH/lidar.f90 index 976de3ca396061d429dbdb10531c45da38bfc020..4a3d987e8873486c7ce58e984cf78dc6b21a49da 100644 --- a/src/MNH/lidar.f90 +++ b/src/MNH/lidar.f90 @@ -1,4 +1,4 @@ -!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. @@ -86,6 +86,7 @@ END MODULE MODI_LIDAR !! add inputs (lidar charact. and cloud fraction) !! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 !! B.VIE 2016 : LIMA +! P. Wautelet 18/03/2020: remove ICE2 option !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -260,7 +261,7 @@ SELECT CASE ( HCLOUD ) ZRTMIN(2) = 1.0E-20 ZRTMIN(3) = 1.0E-20 ZLBEXR = 1.0/(-1.0-3.0) - CASE('ICE2','ICE3','ICE4') + CASE('ICE3','ICE4') ZRTMIN(1:SIZE(WRTMIN)) = WRTMIN(1:SIZE(WRTMIN)) ZLBEXR = WLBEXR ZCCS = XCCS @@ -370,7 +371,7 @@ ZREFF_FACT = 1.0E-3*(3.E3/(4.0*XPI*0.67E-3))**0.33 ! Continental N=500 ZREFF_FACT = 1.0E-3*(3.E3/(4.0*XPI*0.80E-3))**0.33 ! Maritime N=150 ! SELECT CASE ( HCLOUD ) - CASE('KESS','ICE2','ICE3','ICE4') + CASE('KESS','ICE3','ICE4') DO JK = IKB, IKE DO JJ = IJB, IJE DO JI = IIB, IIE @@ -462,7 +463,7 @@ END SELECT ! SOLID ICE ! SELECT CASE ( HCLOUD ) - CASE('ICE2','ICE3','ICE4') + CASE('ICE3','ICE4') DO JK = IKB, IKE DO JJ = IJB, IJE DO JI = IIB, IIE @@ -512,7 +513,7 @@ SELECT CASE ( HCLOUD ) END DO END SELECT SELECT CASE ( HCLOUD ) - CASE('ICE2','ICE3','ICE4','C3R5','LIMA') + CASE('ICE3','ICE4','C3R5','LIMA') DO JK = IKB, IKE DO JJ = IJB, IJE DO JI = IIB, IIE diff --git a/src/MNH/write_lfifm1_for_diag.f90 b/src/MNH/write_lfifm1_for_diag.f90 index 90eb9db9fec006b07514c1dd7663a40c475069b9..29448bab9ed69fc142cb96a0a161c2d667f772ee 100644 --- a/src/MNH/write_lfifm1_for_diag.f90 +++ b/src/MNH/write_lfifm1_for_diag.f90 @@ -143,7 +143,8 @@ END MODULE MODI_WRITE_LFIFM1_FOR_DIAG !! D.Ricard and P.Marquet 2016-2017 : THETAL + THETAS1 POVOS1 or THETAS2 POVOS2 !! if LMOIST_L LMOIST_S1 or LMOIST_S2 ! P. Wautelet 08/02/2019: minor bug: compute ZWORK36 only when needed -!! Bielli S. 02/2019 Sea salt : significant sea wave height influences salt emission; 5 salt modes +! S Bielli 02/2019: sea salt: significant sea wave height influences salt emission; 5 salt modes +! P. Wautelet 18/03/2020: remove ICE2 option !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -3909,7 +3910,7 @@ IF (LLIDAR) THEN ZTMP2(:,:,:,1)=ZRG_DST(:,:,:,IACCMODE) ZTMP3(:,:,:,1)=ZSIG_DST(:,:,:,IACCMODE) SELECT CASE ( CCLOUD ) - CASE('KESS','ICE2','ICE3','ICE4') + CASE('KESS''ICE3','ICE4') CALL LIDAR(CCLOUD, YVIEW, XALT_LIDAR, XWVL_LIDAR, XZZ, XRHODREF, XCLDFR, & XRT, ZWORK31, ZWORK32, & PDSTC=ZTMP1, & @@ -3947,7 +3948,7 @@ IF (LLIDAR) THEN END SELECT ELSE SELECT CASE ( CCLOUD ) - CASE('KESS','ICE2','ICE3','ICE4') + CASE('KESS','ICE3','ICE4') CALL LIDAR(CCLOUD, YVIEW, XALT_LIDAR, XWVL_LIDAR, XZZ, XRHODREF, XCLDFR, & XRT, ZWORK31, ZWORK32) CASE('C2R2')