diff --git a/src/MNH/mode_mnh_timing.f90 b/src/MNH/mode_mnh_timing.f90 index 8c1afe17147344f67c73d91da6b129272dfbbf28..24fedf3a4364fd01c22fddc4459728671e9d4457 100644 --- a/src/MNH/mode_mnh_timing.f90 +++ b/src/MNH/mode_mnh_timing.f90 @@ -12,7 +12,8 @@ MODULE MODE_MNH_TIMING ! P. Wautelet 10/01/2019: use NEWUNIT argument of OPEN ! P. Wautelet 22/03/2019: use MNHREAL64 and MNHREAL64_MPI + typo corrections ! P. Wautelet 27/03/2019: use MNHTIME and MNHTIME_MPI instead of MNHREAL64 and MNHREAL64_MPI -! +! P. Wautelet 28/03/2019: use TFILE instead of unit number for set_iluout_timing +!------------------------------------------------------------------------ implicit none @@ -40,14 +41,17 @@ xt(2) = MPI_WTIME() end subroutine second_mnh2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +subroutine set_iluout_timing(tfile) -!JUAN - SUBROUTINE SET_ILUOUT_TIMING(KLUOUT) - IMPLICIT NONE - INTEGER, INTENT(IN) :: KLUOUT - NLUOUT_TIMING = KLUOUT - END SUBROUTINE SET_ILUOUT_TIMING +use modd_io_ll, only: tfiledata + +implicit none + +type(tfiledata), intent(in) :: tfile + +nluout_timing = tfile%nlu +end subroutine set_iluout_timing !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90 index c8cb87d01b35fe78fa53eff85c02c3334efe7b74..ef5ea2335600d3bbb5bf081c4977b5d0ebec2d0d 100644 --- a/src/MNH/modeln.f90 +++ b/src/MNH/modeln.f90 @@ -255,6 +255,7 @@ END MODULE MODI_MODEL_n ! to allow to disable writes (for bench purposes) !! 02/2019 C.Lac add rain fraction as an output field ! P. Wautelet 28/03/2019: use MNHTIME for time measurement variables +! P. Wautelet 28/03/2019: use TFILE instead of unit number for set_iluout_timing !!------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -2119,7 +2120,7 @@ IF (OEXIT) THEN ! ! Set File Timing OUTPUT ! - CALL SET_ILUOUT_TIMING(ILUOUT) + CALL SET_ILUOUT_TIMING(TLUOUT) ! ! Compute global time ! diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90 index 63ee062ea8fbf731eca2a00fc85288835fc9e26b..4dc697aa839404e258a89952a94a1daa3e9bb852 100644 --- a/src/MNH/prep_ideal_case.f90 +++ b/src/MNH/prep_ideal_case.f90 @@ -312,6 +312,7 @@ !! 01/2018 (G.Delautier) SURFEX 8.1 ! P. Wautelet: 05/2016-04/2018: new data structures and calls for I/O ! P. Wautelet 28/03/2019: use MNHTIME for time measurement variables +! P. Wautelet 28/03/2019: use TFILE instead of unit number for set_iluout_timing !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -1875,7 +1876,7 @@ END IF ! ! Set File Timing OUTPUT ! - CALL SET_ILUOUT_TIMING(NLUOUT) + CALL SET_ILUOUT_TIMING(TLUOUT0) ! ! Compute global time !