diff --git a/src/LIB/SURCOUCHE/src/modd_var_ll.f90 b/src/LIB/SURCOUCHE/src/modd_var_ll.f90 index cffb275aa3389461dd575d1c32ea877980898af4..3be23f351c721ff1c93cbd428ff4e0e8dcdeaf6e 100644 --- a/src/LIB/SURCOUCHE/src/modd_var_ll.f90 +++ b/src/LIB/SURCOUCHE/src/modd_var_ll.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-2023 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. @@ -110,8 +110,6 @@ INTEGER,SAVE :: NZ_PROC_ll = 0 ! Number of proc to use in the Z splitting ! DIMX = NIMAX + 2*JPHEXT ... ! INTEGER :: DIMX,DIMY,DIMZ -! - INTEGER, PARAMETER :: NTMAX = 100 ! ! maximum size of 2D and 3D buffers ! diff --git a/src/MNH/ch_aer_init_soa.f90 b/src/MNH/ch_aer_init_soa.f90 index 0dbc529a95bd07abd996b37f90dfa681ef299cf7..ed12e0c2510ff0de5d6fe22d1d0fad10c0ea3be1 100644 --- a/src/MNH/ch_aer_init_soa.f90 +++ b/src/MNH/ch_aer_init_soa.f90 @@ -1,13 +1,8 @@ -!ORILAM_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!ORILAM_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier !ORILAM_LIC This is part of the ORILAM software governed by the CeCILL-C licence !ORILAM_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !ORILAM_LIC for details. !----------------------------------------------------------------- -!--------------- special set of characters for RCS information -!----------------------------------------------------------------- -! $Source$ $Revision$ -! MASDEV4_7 chimie 2006/05/18 13:07:25 -!----------------------------------------------------------------- !! ######################## MODULE MODI_CH_AER_INIT_SOA !! ######################## @@ -50,9 +45,8 @@ END MODULE MODI_CH_AER_INIT_SOA !! None !! USE MODD_CH_AEROSOL -USE MODD_CH_M9_n, ONLY : CNAMES, NEQ +USE MODD_CH_M9_n, ONLY : CNAMES USE MODD_CH_MNHC_n, ONLY : CCH_SCHEME -USE MODD_NSV, ONLY : NSV_CHEM !! IMPLICIT NONE !! diff --git a/src/MNH/lesn.f90 b/src/MNH/lesn.f90 index f66f89eae81a2f226ff87fd494f3982cc065fc61..11905f8b2cde45332f5bd6dc1223a9d428af632e 100644 --- a/src/MNH/lesn.f90 +++ b/src/MNH/lesn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2000-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2000-2023 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. @@ -72,6 +72,11 @@ USE MODD_PARAM_ICE, ONLY: LDEPOSC,LSEDIC USE MODD_PARAM_C2R2, ONLY: LDEPOC,LSEDC USE MODD_PARAM_LIMA, ONLY : MSEDC=>LSEDC ! +USE MODE_BL_DEPTH_DIAG +USE MODE_FILL_DIMPHYEX, ONLY: FILL_DIMPHYEX +USE MODE_ll +USE MODE_MODELN_HANDLER +! USE MODI_SHUMAN USE MODI_GRADIENT_M USE MODI_GRADIENT_U @@ -84,11 +89,6 @@ USE MODI_THL_RT_FROM_TH_R USE MODI_LES_RES_TR USE MODI_BUDGET_FLAGS USE MODI_LES_BUDGET_TEND_n -USE MODE_BL_DEPTH_DIAG -! -USE MODE_ll -USE MODE_MODELN_HANDLER -USE MODE_FILL_DIMPHYEX, ONLY: FILL_DIMPHYEX ! IMPLICIT NONE ! @@ -878,7 +878,9 @@ END DO ! IF (NLES_CURRENT_TCOUNT==1) THEN ALLOCATE(ZZ_LES (IIU,IJU,NLES_K)) + !ZZ_LES = vertical position of the mass points where data is computed CALL LES_VER_INT( MZF(XZZ) ,ZZ_LES ) + !XLES_Z = mean vertical altitude for each level (taking into account the mask) CALL LES_MEAN_ll ( ZZ_LES, LLES_CURRENT_CART_MASK, XLES_Z ) DEALLOCATE(ZZ_LES) CALL LES_MEAN_ll ( XZS, LLES_CURRENT_CART_MASK(:,:,1), XLES_ZS ) diff --git a/src/MNH/mode_pos.f90 b/src/MNH/mode_pos.f90 index 1a8344973bc1ae797242feb6205c49603f716d8f..eaf7b13f6ffe8e8040e421a448446c8115efd683 100644 --- a/src/MNH/mode_pos.f90 +++ b/src/MNH/mode_pos.f90 @@ -111,7 +111,7 @@ YDNAML = Upcase( HDNAML ) ! Force namelist name into upper case (read namelist n search_nam : DO READ ( UNIT=ILU, FMT='(A)', IOSTAT=IRET, IOMSG=YERRORMSG, END=100 ) YLINE IF (IRET /= 0 ) THEN - call Print_msg( NVERB_ERROR, 'IO', 'POSNAM', 'read error:' // Trim( YERRORMSG ) ) + call Print_msg( NVERB_ERROR, 'IO', 'POSNAM', Trim( HDNAML) // ': read error:' // Trim( YERRORMSG ) ) ELSE YLINE = Upcase( YLINE ) IND1 = INDEX( YLINE, '&'//YDNAML ) diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90 index 2ae06f47d2024e6d5473f08773e1180b9f7174ef..387f6c4ecdd9bfcdf09b4479ca4a56663786628d 100644 --- a/src/MNH/modeln.f90 +++ b/src/MNH/modeln.f90 @@ -321,6 +321,7 @@ USE MODD_DYNZD_n USE MODD_ELEC_DESCR USE MODD_EOL_MAIN USE MODD_FIELD_n +USE MODD_FIRE_n USE MODD_FRC USE MODD_FRC_n USE MODD_GET_n @@ -465,7 +466,6 @@ USE MODI_WRITE_LFIFM_n USE MODI_WRITE_SERIES_n USE MODI_WRITE_SURF_ATM_N ! -USE MODD_FIRE_n IMPLICIT NONE ! !* 0.1 declarations of arguments diff --git a/src/MNH/write_aircraft_balloon.f90 b/src/MNH/write_aircraft_balloon.f90 index 367f1e762fe93959809b3e4228eb44a74a7494ad..0678daffcf2abf43cc85ecc6f40e7d99bf116203 100644 --- a/src/MNH/write_aircraft_balloon.f90 +++ b/src/MNH/write_aircraft_balloon.f90 @@ -293,7 +293,6 @@ if ( irr >= 6 ) call Add_point( 'Rg', 'Graupel mixing ratio', 'kg kg- if ( irr >= 7 ) call Add_point( 'Rh', 'Hail mixing ratio', 'kg kg-1', tpflyer%xr(1,:,7) ) ! !add cloud liquid water content in g/m3 to compare to measurements from FSSP -!IF (.NOT.(ANY(TPFLYER%XP(:) == 0.))) THEN IF ( IRR > 1 ) THEN !cloud water is present ALLOCATE( ZRHO(1, 1, ISTORE) ) ALLOCATE( ZLWC(ISTORE) )