diff --git a/src/MNH/call_rttov11.f90 b/src/MNH/call_rttov11.f90 index 8e69111883567834631b7ccbce85d926a4e8d862..e9eda58c83d726d4d3b27d595189f32abf9aadfd 100644 --- a/src/MNH/call_rttov11.f90 +++ b/src/MNH/call_rttov11.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2021 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. diff --git a/src/MNH/call_rttov13.f90 b/src/MNH/call_rttov13.f90 index 1ea5ca251092611145952dec6254defff741af6e..97ccf20af2a1a608ad00478b2f05046572cef425 100644 --- a/src/MNH/call_rttov13.f90 +++ b/src/MNH/call_rttov13.f90 @@ -1,6 +1,6 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2021 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------- ! ######################## diff --git a/src/MNH/ch_monitorn.f90 b/src/MNH/ch_monitorn.f90 index 6e817aa0f12bc2c3c1aba44cdd08c812eabc000e..eee756dfbcdba0278206e33b4255e2cd1212b6c1 100644 --- a/src/MNH/ch_monitorn.f90 +++ b/src/MNH/ch_monitorn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2021 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. diff --git a/src/MNH/forcing.f90 b/src/MNH/forcing.f90 index 04a4a91cd280cb170667db196631e49d3b3d9d88..14a65ad60ebc6668b4a38851dc32ab1b06259041 100644 --- a/src/MNH/forcing.f90 +++ b/src/MNH/forcing.f90 @@ -171,8 +171,8 @@ USE MODD_TIME use mode_budget, only: Budget_store_init, Budget_store_end USE MODE_DATETIME USE MODE_GATHER_ll -USE MODE_MSG USE MODE_ll +USE MODE_MSG USE MODE_REPRO_SUM ! USE MODI_GET_HALO diff --git a/src/MNH/ini_posprofilern.f90 b/src/MNH/ini_posprofilern.f90 index 7d5a3cd0df45721c88374309b73a19e9a79c2e70..08b25fba13d2dfdc78cdaf669b31ee81a1bdd62f 100644 --- a/src/MNH/ini_posprofilern.f90 +++ b/src/MNH/ini_posprofilern.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2021 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. @@ -65,7 +65,7 @@ END MODULE MODI_INI_POSPROFILER_n !! C.Lac 10/2016 Add visibility diagnostic !! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O ! P. Wautelet 13/09/2019: budget: simplify and modernize date/time management -! M.Taufour : modify RARE for hydrometeors containing ice and add bright band calculation for RARE +! M. Taufour 05/07/2021: modify RARE for hydrometeors containing ice and add bright band calculation for RARE !! -------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -175,7 +175,7 @@ ALLOCATE(TPROFILER%RHOD (ISTORE,IKU,NUMBPROFILER)) ALLOCATE(TPROFILER%VISI (ISTORE,IKU,NUMBPROFILER)) ALLOCATE(TPROFILER%VISIKUN(ISTORE,IKU,NUMBPROFILER)) ALLOCATE(TPROFILER%CRARE (ISTORE,IKU,NUMBPROFILER)) -ALLOCATE(TPROFILER%CRARE_ATT (ISTORE,IKU,NUMBPROFILER)) +ALLOCATE(TPROFILER%CRARE_ATT(ISTORE,IKU,NUMBPROFILER)) ALLOCATE(TPROFILER%LWCZ (ISTORE,IKU,NUMBPROFILER)) ALLOCATE(TPROFILER%IWCZ (ISTORE,IKU,NUMBPROFILER)) ALLOCATE(TPROFILER%CIZ (ISTORE,IKU,NUMBPROFILER)) diff --git a/src/MNH/ini_radiations_ecrad.f90 b/src/MNH/ini_radiations_ecrad.f90 index be2571b921452e8dcaea3888d809919b532c62d1..7c9349afeb1656c871411d9b57f8d9c34ffa569d 100644 --- a/src/MNH/ini_radiations_ecrad.f90 +++ b/src/MNH/ini_radiations_ecrad.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2021 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. diff --git a/src/MNH/modd_param_ecradn.f90 b/src/MNH/modd_param_ecradn.f90 index a984d405b9456ef1f32580a0f373cd5fcc550783..3be9a339116b1b1db0928a80979b3a923350681c 100644 --- a/src/MNH/modd_param_ecradn.f90 +++ b/src/MNH/modd_param_ecradn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2017-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2017-2021 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. diff --git a/src/MNH/modd_radiationsn.f90 b/src/MNH/modd_radiationsn.f90 index c0953ce5ebdea59995cd0e4c366681fb23580383..743c3707434493667b8b5eee8765ff3d6d67438c 100644 --- a/src/MNH/modd_radiationsn.f90 +++ b/src/MNH/modd_radiationsn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2021 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. diff --git a/src/MNH/modd_type_profiler.f90 b/src/MNH/modd_type_profiler.f90 index 64cd438eeb9774a852cb89895a4942e7fdea910e..b5fedbf60ab7d849a2d04fc98d3047daa34cad64 100644 --- a/src/MNH/modd_type_profiler.f90 +++ b/src/MNH/modd_type_profiler.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2021 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. @@ -31,7 +31,7 @@ !! Original 15/01/02 !! C.Lac 10/2016 Add visibility diagnostic ! P. Wautelet 13/09/2019: budget: simplify and modernize date/time management -! M.Taufour 07/2021: modify RARE for hydrometeors containing ice and add bright band calculation for RARE +! M. Taufour 05/07/2021: modify RARE for hydrometeors containing ice and add bright band calculation for RARE !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS diff --git a/src/MNH/modn_param_ecradn.f90 b/src/MNH/modn_param_ecradn.f90 index 1cf2bfa4704a09d08eec5211e7aaa0e9ab4cb2f7..9d168f330b41adc2e54531345f39fd3320d79f92 100644 --- a/src/MNH/modn_param_ecradn.f90 +++ b/src/MNH/modn_param_ecradn.f90 @@ -1,13 +1,8 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2021 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 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$ -! MASDEV4_7 modn 2006/11/23 17:22:54 -!----------------------------------------------------------------- ! ######################## MODULE MODN_PARAM_ECRAD_n ! ######################## diff --git a/src/MNH/profilern.f90 b/src/MNH/profilern.f90 index f91695cd03a4bc5a6bfd7fc3e806daed877a3ea7..433a5c6ef02ae8a1630718f497b1f602b536f7a5 100644 --- a/src/MNH/profilern.f90 +++ b/src/MNH/profilern.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2021 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. @@ -12,7 +12,7 @@ INTERFACE SUBROUTINE PROFILER_n(PTSTEP, & PXHAT, PYHAT, PZ,PRHODREF, & PU, PV, PW, PTH, PR, PSV, PTKE, & - PTS,PP, PAER, PCLDFR, PCIT,PSEA) + PTS, PP, PAER, PCLDFR, PCIT, PSEA) ! REAL, INTENT(IN) :: PTSTEP ! time step REAL, DIMENSION(:), INTENT(IN) :: PXHAT ! x coordinate @@ -31,7 +31,7 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PP ! pressure REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PAER ! aerosol extinction REAL, DIMENSION(:,:,:), INTENT(IN) :: PCLDFR ! cloud fraction REAL, DIMENSION(:,:,:), INTENT(IN) :: PCIT ! ice concentration -REAL, DIMENSION(:,:),INTENT(IN) :: PSEA ! for radar +REAL, DIMENSION(:,:), INTENT(IN) :: PSEA ! for radar ! !------------------------------------------------------------------------------- ! @@ -84,7 +84,7 @@ END MODULE MODI_PROFILER_n !! March,28, 2018 (P. Wautelet) replace TEMPORAL_DIST by DATETIME_DISTANCE !! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O ! P. Wautelet 13/09/2019: budget: simplify and modernize date/time management -! M.Taufour 07/2021: modify RARE for hydrometeors containing ice and add bright band calculation for RARE +! M. Taufour 05/07/2021: modify RARE for hydrometeors containing ice and add bright band calculation for RARE ! -------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -157,7 +157,7 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PP ! pressure REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PAER ! aerosol extinction REAL, DIMENSION(:,:,:), INTENT(IN) :: PCLDFR ! cloud fraction REAL, DIMENSION(:,:,:), INTENT(IN) :: PCIT ! ice concentration -REAL, DIMENSION(:,:),INTENT(IN) :: PSEA ! for radar +REAL, DIMENSION(:,:), INTENT(IN) :: PSEA ! for radar ! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/set_mass.f90 b/src/MNH/set_mass.f90 index 4563a4c6d85559ec5ec5a334bd5c3efdb7f4c3a0..b3402a0e3cd0ece6682058f04aa386e84f37686a 100644 --- a/src/MNH/set_mass.f90 +++ b/src/MNH/set_mass.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2010-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2010-2021 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. diff --git a/src/MNH/write_lfifm1_for_diag_supp.f90 b/src/MNH/write_lfifm1_for_diag_supp.f90 index 72b614ae57b534f0399a0ad289fd92898c7eecad..1bb11e435afd44755eff957d81908fa904554cb6 100644 --- a/src/MNH/write_lfifm1_for_diag_supp.f90 +++ b/src/MNH/write_lfifm1_for_diag_supp.f90 @@ -850,21 +850,17 @@ IF (NRTTOVINFO(1,1) /= NUNDEF) THEN CALL CALL_RTTOV8(NDLON, NFLEV, NSTATM, XEMIS(:,:,1), XTSRAD, XSTATM, XTHT, XRT, & XPABST, XZZ, XMFCONV, XCLDFR, XUT(:,:,IKB), XVT(:,:,IKB), & LUSERI, NRTTOVINFO, TPFILE ) -#else -#ifdef MNH_RTTOV_11 +#elif MNH_RTTOV_11 CALL CALL_RTTOV11(NDLON, NFLEV, XEMIS(:,:,1), XTSRAD, XTHT, XRT, & XPABST, XZZ, XMFCONV, XCLDFR, XUT(:,:,IKB), XVT(:,:,IKB), & LUSERI, NRTTOVINFO, TPFILE ) -#else -#ifdef MNH_RTTOV_13 +#elif MNH_RTTOV_13 CALL CALL_RTTOV13(NDLON, NFLEV, XEMIS(:,:,1), XTSRAD, XTHT, XRT, & XPABST, XZZ, XMFCONV, XCLDFR, XUT(:,:,IKB), XVT(:,:,IKB), & LUSERI, NRTTOVINFO, TPFILE ) #else PRINT *, "RTTOV LIBRARY NOT AVAILABLE = ###CALL_RTTOV####" #endif -#endif -#endif END IF ! !-------------------------------------------------------------------------------