From efc440ef57af8c1770b37b6214a5292ef4de52bd Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@cnrs.fr> Date: Mon, 21 Oct 2024 11:33:12 +0200 Subject: [PATCH] Philippe 21/10/2024: IO: move use of menu_diachro to write_les_n --- src/MNH/diag.f90 | 3 --- src/MNH/modeln.f90 | 6 ------ src/MNH/write_lesn.f90 | 9 ++++++++- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/MNH/diag.f90 b/src/MNH/diag.f90 index 40f498211..6e291b4aa 100644 --- a/src/MNH/diag.f90 +++ b/src/MNH/diag.f90 @@ -145,9 +145,6 @@ USE MODE_IO_FILE, only: IO_File_close, IO_File_open USE MODE_IO, only: IO_Config_set, IO_Init USE MODE_IO_MANAGE_STRUCT, only: IO_File_add2list USE MODE_ll -#ifdef MNH_IOLFI -use mode_menu_diachro, only: MENU_DIACHRO -#endif USE MODE_MNH_TIMING USE MODE_MODELN_HANDLER USE MODE_MSG diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90 index 09ddb79e6..81fa0770b 100644 --- a/src/MNH/modeln.f90 +++ b/src/MNH/modeln.f90 @@ -392,9 +392,6 @@ USE MODE_IO_FILE, only: IO_File_close, IO_File_open USE MODE_IO_MANAGE_STRUCT, only: IO_File_add2list, IO_File_remove_from_list, & IO_Is_backup_time, IO_Is_output_time, IO_BakOut_file_create USE MODE_ll -#ifdef MNH_IOLFI -use mode_menu_diachro, only: MENU_DIACHRO -#endif USE MODE_MNH_TIMING USE MODE_MODELN_HANDLER USE MODE_MPPDB @@ -2349,9 +2346,6 @@ IF (OEXIT) THEN CALL WRITE_STATPROF_n( TDIAFILE, TSTATIONS ) CALL WRITE_STATPROF_n( TDIAFILE, TPROFILERS ) call Write_les_n( tdiafile ) -#ifdef MNH_IOLFI - CALL MENU_DIACHRO(TDIAFILE,'END') -#endif CALL IO_File_close(TDIAFILE) ! Free memory of flyer that is not present on the master process of the file (was allocated in WRITE_AIRCRAFT_BALLOON) CALL AIRCRAFT_BALLOON_FREE_NONLOCAL( TDIAFILE ) diff --git a/src/MNH/write_lesn.f90 b/src/MNH/write_lesn.f90 index c35e3eafa..444712500 100644 --- a/src/MNH/write_lesn.f90 +++ b/src/MNH/write_lesn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2000-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2000-2024 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. @@ -94,6 +94,9 @@ use modd_parameters, only: XUNDEF use mode_les_spec_n, only: Les_spec_n use mode_modeln_handler, only: Get_current_model_index +#ifdef MNH_IOLFI +use mode_menu_diachro, only: Menu_diachro +#endif use mode_write_les_budget_n, only: Write_les_budget_n use mode_write_les_rt_budget_n, only: Write_les_rt_budget_n use mode_write_les_sv_budget_n, only: Write_les_sv_budget_n @@ -1187,6 +1190,10 @@ IF (CLES_NORM_TYPE/='NONE' ) THEN CALL LES_DEALLOCATE('XLES_NORM_P') END IF +#ifdef MNH_IOLFI +call Menu_diachro( tpdiafile, 'END' ) +#endif + end subroutine Write_les_n !------------------------------------------------------------------------------ -- GitLab