From fd5a209a86d596eff55b07ced765590cabbfb3ed Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 16 Dec 2022 11:31:03 +0100
Subject: [PATCH] Philippe 16/12/2022: aircraft_balloon: modi->mode
---
src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 | 2 +-
src/MNH/aircraft_balloon.f90 | 50 +++++----------------
src/MNH/diag.f90 | 2 +-
src/MNH/modeln.f90 | 2 +-
src/MNH/write_aircraft_balloon.f90 | 2 +-
5 files changed, 15 insertions(+), 43 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90 b/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90
index b9c92d64b..ff1782c84 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_write_nc4.f90
@@ -2266,9 +2266,9 @@ subroutine Write_flyer_time_coord( tpflyer )
use modd_aircraft_balloon
use modd_parameters, only: NBUNAMELGTMAX, XUNDEF
+ use mode_aircraft_balloon, only: Aircraft_balloon_longtype_get
use mode_io_tools_nc4, only: IO_Mnhname_clean
- use modi_aircraft_balloon, only: Aircraft_balloon_longtype_get
class(tflyerdata), intent(in) :: tpflyer
diff --git a/src/MNH/aircraft_balloon.f90 b/src/MNH/aircraft_balloon.f90
index 5028e0d9f..068d03cb2 100644
--- a/src/MNH/aircraft_balloon.f90
+++ b/src/MNH/aircraft_balloon.f90
@@ -4,48 +4,18 @@
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! #####################
-MODULE MODI_AIRCRAFT_BALLOON
+MODULE MODE_AIRCRAFT_BALLOON
! #####################
-!
-INTERFACE
-!
- SUBROUTINE AIRCRAFT_BALLOON(PTSTEP, PZ, &
- PMAP, PLONOR, PLATOR, &
- PU, PV, PW, PP, PTH, PR, PSV, PTKE, &
- PTS, PRHODREF, PCIT, PSEA )
-!
-REAL, INTENT(IN) :: PTSTEP ! time step
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PZ ! z
-REAL, DIMENSION(:,:), INTENT(IN) :: PMAP ! map factor
-REAL, INTENT(IN) :: PLONOR ! origine longitude
-REAL, INTENT(IN) :: PLATOR ! origine latitude
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PU ! horizontal wind X component
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PV ! horizontal wind Y component
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PW ! vertical wind
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PP ! pressure
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PTH ! potential temperature
-REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PR ! water mixing ratios
-REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PSV ! Scalar variables
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PTKE ! turbulent kinetic energy
-REAL, DIMENSION(:,:), INTENT(IN) :: PTS ! surface temperature
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PRHODREF ! dry air density of the reference state
-REAL, DIMENSION(:,:,:), INTENT(IN) :: PCIT ! pristine ice concentration
-REAL, DIMENSION(:,:), OPTIONAL, INTENT(IN) :: PSEA
-!
-!-------------------------------------------------------------------------------
-!
-END SUBROUTINE AIRCRAFT_BALLOON
-!
-SUBROUTINE AIRCRAFT_BALLOON_LONGTYPE_GET( TPFLYER, HLONGTYPE )
- USE MODD_AIRCRAFT_BALLOON, ONLY: TFLYERDATA
- CLASS(TFLYERDATA), INTENT(IN) :: TPFLYER
- CHARACTER(LEN=*), INTENT(OUT) :: HLONGTYPE
-END SUBROUTINE AIRCRAFT_BALLOON_LONGTYPE_GET
+IMPLICIT NONE
-END INTERFACE
-!
-END MODULE MODI_AIRCRAFT_BALLOON
+PRIVATE
+
+PUBLIC :: AIRCRAFT_BALLOON
+
+PUBLIC :: AIRCRAFT_BALLOON_LONGTYPE_GET
+
+CONTAINS
!
! #################################################################
SUBROUTINE AIRCRAFT_BALLOON(PTSTEP, PZ, &
@@ -192,3 +162,5 @@ if ( Len_trim( ytype ) > Len( HLONGTYPE ) ) &
HLONGTYPE = Trim( ytype )
END SUBROUTINE AIRCRAFT_BALLOON_LONGTYPE_GET
+
+END MODULE MODE_AIRCRAFT_BALLOON
diff --git a/src/MNH/diag.f90 b/src/MNH/diag.f90
index 59e39266e..abc759976 100644
--- a/src/MNH/diag.f90
+++ b/src/MNH/diag.f90
@@ -141,6 +141,7 @@ USE MODD_TIME_n
USE MODD_TURB_n
USE MODD_VAR_ll
!
+USE MODE_AIRCRAFT_BALLOON
USE MODE_DATETIME
USE MODE_FINALIZE_MNH, only: FINALIZE_MNH
USE MODE_IO_FILE, only: IO_File_close, IO_File_open
@@ -159,7 +160,6 @@ USE MODE_TIME
USE MODE_WRITE_AIRCRAFT_BALLOON
use mode_write_lfifmn_fordiachro_n, only: WRITE_LFIFMN_FORDIACHRO_n
!
-USE MODI_AIRCRAFT_BALLOON
USE MODI_CH_MONITOR_n
USE MODI_COMPUTE_R00
USE MODI_DIAG_SURF_ATM_N
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index e6dfee3dc..8d9b03f17 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -364,6 +364,7 @@ USE MODD_TURB_CLOUD, ONLY: NMODEL_CLOUD,CTURBLEN_CLOUD,XCEI
USE MODD_TURB_n
USE MODD_VISCOSITY
!
+USE MODE_AIRCRAFT_BALLOON
use mode_budget, only: Budget_store_init, Budget_store_end
USE MODE_DATETIME
USE MODE_ELEC_ll
@@ -393,7 +394,6 @@ USE MODI_ADVECTION_UVW
USE MODI_ADVECTION_UVW_CEN
USE MODI_ADV_FORCING_n
USE MODI_AER_MONITOR_n
-USE MODI_AIRCRAFT_BALLOON
USE MODI_BLOWSNOW
USE MODI_BOUNDARIES
USE MODI_BUDGET_FLAGS
diff --git a/src/MNH/write_aircraft_balloon.f90 b/src/MNH/write_aircraft_balloon.f90
index 943c01bd3..decf8c040 100644
--- a/src/MNH/write_aircraft_balloon.f90
+++ b/src/MNH/write_aircraft_balloon.f90
@@ -125,12 +125,12 @@ USE MODD_PARAMETERS, ONLY: XUNDEF
USE MODD_PARAM_n, ONLY: CCLOUD
USE MODE_AERO_PSD
+use mode_aircraft_balloon, only: Aircraft_balloon_longtype_get
USE MODE_DUST_PSD
USE MODE_MODELN_HANDLER, ONLY: GET_CURRENT_MODEL_INDEX
use mode_msg
use mode_write_diachro, only: Write_diachro
-use modi_aircraft_balloon, only: Aircraft_balloon_longtype_get
TYPE(TFILEDATA), INTENT(IN) :: TPDIAFILE ! file to write
CLASS(TFLYERDATA), INTENT(IN) :: TPFLYER
--
GitLab