diff --git a/src/MNH/mnh2lpdm.f90 b/src/MNH/mnh2lpdm.f90 index 3918b994be78a5d8be49a64a9d77a39dad7c0b35..6d5c2b1474a0d9c64ac0801552044618c5bfd36f 100644 --- a/src/MNH/mnh2lpdm.f90 +++ b/src/MNH/mnh2lpdm.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2025 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. @@ -91,12 +91,6 @@ TFILE_OUTPUTLISTING => TLUOUT0 ! CFMNH(:) = '' ! -! -!* 1.2 Initialisation routines LL. -! -CALL IO_Init() -! -! !* 1.3 Ouverture du fichier log. ! CALL IO_File_add2list(TZLOGFILE,YFLOG,'TXT','WRITE') diff --git a/src/MNH/mnh2lpdm_ech.f90 b/src/MNH/mnh2lpdm_ech.f90 index c7ee235ab93756469ff2fe6b373d3b67fb0c2031..f975018a21eee11e3fd181e484042508b1c0ebbe 100644 --- a/src/MNH/mnh2lpdm_ech.f90 +++ b/src/MNH/mnh2lpdm_ech.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2009-2024 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2009-2025 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,7 +110,7 @@ CALL IO_Field_read(TPFILE,'TKET', XTKET) tzfield = tfieldmetadata( & cmnhname = 'LM', & - clongname = '', & + clongname = 'LM', & cunits = 'm', & cdir = 'XY', & ccomment = 'Mixing length', & @@ -121,8 +121,8 @@ CALL IO_Field_read(TPFILE, tzfield, XLM) tzfield = tfieldmetadata(& cmnhname = 'THW_FLX', & - clongname = '', & - cunits = 'K s-1', & !correct? + clongname = 'THW_FLX', & + cunits = 'K m s-1', & cdir = 'XY', & ccomment = 'Conservative potential temperature vertical flux', & ngrid = 4, & @@ -131,11 +131,11 @@ tzfield = tfieldmetadata(& CALL IO_Field_read(TPFILE, tzfield, XWPTHP) tzfield = tfieldmetadata( & - cmnhname = 'DISS', & + cmnhname = 'TKE_DISS', & clongname = '', & - cunits = '', & !TODO: set units + cunits = 'm2 s-3', & cdir = 'XY', & - ccomment = 'X_Y_Z_DISS', & + ccomment = 'Subgrid dissipation of TKE', & ngrid = 1, & ntype = TYPEREAL, & ndims = 3 ) diff --git a/src/MNH/mnh2lpdm_ini.f90 b/src/MNH/mnh2lpdm_ini.f90 index fa9b5f282212ea78f0fef1730930e40a07ec29c1..1dde2051c1d89483425101f83701faec6b79db95 100644 --- a/src/MNH/mnh2lpdm_ini.f90 +++ b/src/MNH/mnh2lpdm_ini.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2009-2024 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2009-2025 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. @@ -33,6 +33,7 @@ !* 0.1 Modules. ! USE MODD_CST +USE MODD_DIM_ll USE MODD_DIM_n use modd_field, only: tfieldmetadata, TYPEREAL USE MODD_GRID @@ -47,9 +48,11 @@ USE MODD_TIME_n USE MODE_DATETIME USE MODE_GRIDPROJ USE MODE_INI_CST, ONLY: INI_CST +USE MODE_INIT_ll USE MODE_IO_FILE, only: IO_File_close, IO_File_open USE MODE_IO_FIELD_READ, only: IO_Field_read USE MODE_MODELN_HANDLER +USE MODE_SPLITTINGZ_ll, only: INI_PARAZ_ll ! USE MODI_READ_HGRID USE MODI_XYTOLATLON @@ -77,6 +80,7 @@ CHARACTER(LEN=14) :: YDATMDL,YDATCUR1,YDATCUR2 ! REAL :: XLATOR,XLONOR,XPTLAT,XPTLON REAL :: XXPTSOMNH,XYPTSOMNH +INTEGER :: IRESP INTEGER :: JI,JJ,JK,a INTEGER :: b,c,I INTEGER, DIMENSION(:), ALLOCATABLE :: TAB1D @@ -94,10 +98,6 @@ IFDAT = TPDATEFILE%NLU IFGRI = TPGRIDFILE%NLU IFLOG = TPLOGFILE%NLU ! -CALL INI_CST -! -CALL GOTO_MODEL(1) -! ! !* 2. DONNEES MESO-NH. ! ---------------- @@ -107,6 +107,31 @@ CALL GOTO_MODEL(1) CALL IO_File_open(TPFILE1) CALL IO_File_open(TPFILE2) ! +! Do some initialisations +! +CALL IO_Field_read(TPFILE1,'IMAX', NIMAX) +CALL IO_Field_read(TPFILE1,'JMAX', NJMAX) +CALL IO_Field_read(TPFILE1,'KMAX', NKMAX) +CALL IO_Field_read(TPFILE1,'JPHEXT',JPHEXT) +! +CALL SET_JP_ll(1,JPHEXT,JPVEXT,JPHEXT) +CALL SET_DIM_ll(NIMAX, NJMAX, NKMAX) + +NXOR_ALL(1) = 1 +NXEND_ALL(1) = NIMAX+2*JPHEXT +NYOR_ALL(1) = 1 +NYEND_ALL(1) = NJMAX+2*JPHEXT +NDXRATIO_ALL(1) = 1 +NDYRATIO_ALL(1) = 1 + +! initialize variables from MODD_DIM_ll, origin and end of global model 1 in coordinates of its father +CALL SET_XOR_ll(NXOR_ALL(1), 1) +CALL SET_XEND_ll(NXEND_ALL(1), 1) +CALL SET_YOR_ll(NYOR_ALL(1), 1) +CALL SET_YEND_ll(NYEND_ALL(1), 1) + +CALL INI_PARAZ_ll(IRESP) +! ! !* 2.2 Date et heure du modele. ! @@ -168,7 +193,6 @@ NJE=NJU-JPHEXT ! !* 2.4 Nombre de niveaux-verticaux. ! -CALL IO_Field_read(TPFILE1,'KMAX',NKMAX) !WRITE(IFLOG,*) '%%% MNH2S2_INI Lecture du nombre de niveau OK.' ! NKU = NKMAX+2*JPVEXT