From bcb26046bfb71c27e06db0d24d1ecd1c98b32ffa Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 23 Mar 2023 09:05:50 +0100
Subject: [PATCH] Philippe 23/03/2023: AIRCRAFT_CSV_READ: improve problem
 detection

---
 src/MNH/ini_aircraft.f90 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/MNH/ini_aircraft.f90 b/src/MNH/ini_aircraft.f90
index 331df58cf..e571b03a7 100644
--- a/src/MNH/ini_aircraft.f90
+++ b/src/MNH/ini_aircraft.f90
@@ -223,10 +223,13 @@ CHARACTER(LEN=*),    INTENT(IN)    :: HFILE !Name of the CSV file with the aircr
 
 CHARACTER(LEN=NMAXLINELGT) :: YSTRING
 INTEGER                    :: ILU      ! logical unit of the file
+INTEGER                    :: ILINESREAD ! Number of lines read and treated (the 1st one is skipped)
 INTEGER                    :: JI
 REAL                       :: ZLAT, ZLON, ZALT
 REAL                       :: ZTIME
 
+ILINESREAD = 0
+
 ! Open file
 OPEN( NEWUNIT = ILU, FILE = HFILE, FORM = 'formatted' )
 
@@ -235,6 +238,7 @@ READ( ILU, END = 101, FMT = '(A)' ) YSTRING ! Reading of header (skip it)
 DO JI = 1, TPAIRCRAFT%NPOS
   ! Read aircraft position
   READ( ILU, END = 101, FMT = '(A)' ) YSTRING
+  ILINESREAD = ILINESREAD + 1
 
   READ( YSTRING, * ) ZTIME, ZLAT, ZLON, ZALT
 
@@ -252,7 +256,7 @@ END DO
 
 CLOSE( ILU )
 
-IF ( JI < TPAIRCRAFT%NPOS ) &
+IF ( ILINESREAD < TPAIRCRAFT%NPOS ) &
   CALL PRINT_MSG( NVERB_ERROR, 'GEN', 'AIRCRAFT_CSV_READ', 'Data not found in file ' // TRIM( HFILE ), OLOCAL = .TRUE. )
 
 TPAIRCRAFT%TLAND = TPAIRCRAFT%TLAUNCH + TPAIRCRAFT%XPOSTIME(TPAIRCRAFT%NPOS)
-- 
GitLab