From 4335e1fbce0afca2a1fb807c9c32769e303e6c31 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Thu, 29 Feb 2024 10:37:33 +0100 Subject: [PATCH] Philippe 29/02/2024: aircrafts: treat correctly aircrafts that won't fly in the current segment --- src/MNH/aircraft_balloon.f90 | 2 ++ src/MNH/aircraft_balloon_evol.f90 | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/MNH/aircraft_balloon.f90 b/src/MNH/aircraft_balloon.f90 index b66fdc49e..2ad204176 100644 --- a/src/MNH/aircraft_balloon.f90 +++ b/src/MNH/aircraft_balloon.f90 @@ -154,6 +154,8 @@ IF ( ISP == NFLYER_DEFAULT_RANK ) THEN ELSE IF ( TDTCUR > TZAIRCRAFT%TLAND ) THEN ! Nothing to do ! Aircraft will never be in flight in this run. Data will remain on the initial process. + NRANKNXT_AIRCRAFT(JI) = NFLYER_DEFAULT_RANK + CYCLE ELSE ! Aircraft is already in flight at the beginning of the run TZDATE = TDTCUR diff --git a/src/MNH/aircraft_balloon_evol.f90 b/src/MNH/aircraft_balloon_evol.f90 index 2303011da..b50740df5 100644 --- a/src/MNH/aircraft_balloon_evol.f90 +++ b/src/MNH/aircraft_balloon_evol.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2000-2023 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. @@ -998,7 +998,6 @@ USE MODD_AIRCRAFT_BALLOON, ONLY: TAIRCRAFTDATA USE MODD_TYPE_DATE, ONLY: DATE_TIME USE MODE_DATETIME -USE MODE_POSITION_TOOLS, ONLY: FIND_PROCESS_AND_MODEL_FROM_XY_POS IMPLICIT NONE -- GitLab