From fafff381d341d7beb170b390216e567099fc0a48 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 16 Feb 2024 10:03:31 +0100
Subject: [PATCH] Philippe 16/02/2024: rename file, dimension and variables for
Lagrangian trajectories
---
src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90 | 2 +-
src/MNH/compute_r00.f90 | 104 +++++++++---------
src/MNH/diag.f90 | 2 +-
.../{modd_sto_file.f90 => modd_lagr_traj.f90} | 4 +-
4 files changed, 56 insertions(+), 56 deletions(-)
rename src/MNH/{modd_sto_file.f90 => modd_lagr_traj.f90} (95%)
diff --git a/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90 b/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
index 2a1c3f8d5..86b841fc8 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
@@ -349,7 +349,7 @@ end if
if ( tpfile%ctype == 'MNHDIAG' .and. Trim( yprogram ) == 'DIAG' ) then
!Number of times for Lagrangian trajectories
- if ( ltraj .and. ntrajstlg > 0 ) call IO_Add_dim_nc4( tpfile, NMNHDIM_TRAJ_TIME, 'time_lagrangian', ntrajstlg )
+ if ( ltraj .and. ntrajstlg > 0 ) call IO_Add_dim_nc4( tpfile, NMNHDIM_TRAJ_TIME, 'time_traj', ntrajstlg )
end if
!Write dimensions used in diachronic files
diff --git a/src/MNH/compute_r00.f90 b/src/MNH/compute_r00.f90
index 8dfc8c381..371b6f2f3 100644
--- a/src/MNH/compute_r00.f90
+++ b/src/MNH/compute_r00.f90
@@ -30,9 +30,9 @@ CONTAINS
SUBROUTINE INI_COMPUTE_R00()
!#################################
+ USE MODD_LAGR_TRAJ, ONLY: CFILES, NSTART_SUPP, NTRAJSTLG
USE MODD_LUNIT_n, ONLY: CINIFILE
USE MODD_PARAMETERS, ONLY: NUNDEF
- USE MODD_STO_FILE, ONLY: CFILES, NSTART_SUPP, NTRAJSTLG
USE MODE_MSG
@@ -141,10 +141,10 @@ USE MODD_GRID_n
use modd_field, only: NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_LEVEL, NMNHDIM_TRAJ_TIME, tfieldmetadata, TYPEREAL
USE MODD_FIELD_n
USE MODD_IO, ONLY: TFILEDATA
+USE MODD_LAGR_TRAJ
USE MODD_LUNIT_n
USE MODD_NSV, ONLY: NSV_LGBEG, NSV_LGEND
USE MODD_PARAMETERS
-USE MODD_STO_FILE
USE MODD_TYPE_DATE
USE MODD_VAR_ll
!
@@ -263,68 +263,68 @@ ELSE
END IF
!
! Create the metadata of the fields (has to be done only once)
-TZFIELD_X0 = TFIELDMETADATA( &
- CMNHNAME = 'X0', &
- CSTDNAME = '', &
- CLONGNAME = 'X0', &
- CUNITS = 'km', &
- CDIR = 'XY', &
- CCOMMENT = 'X_Y_Z_X0', &
- NGRID = 1, &
- NTYPE = TYPEREAL, &
- NDIMS = 4, &
+TZFIELD_X0 = TFIELDMETADATA( &
+ CMNHNAME = 'X_TRAJ', &
+ CSTDNAME = '', &
+ CLONGNAME = 'X_TRAJ', &
+ CUNITS = 'km', &
+ CDIR = 'XY', &
+ CCOMMENT = 'X_Y_Z_X_TRAJ', &
+ NGRID = 1, &
+ NTYPE = TYPEREAL, &
+ NDIMS = 4, &
NDIMLIST = [ NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_LEVEL, NMNHDIM_TRAJ_TIME ] )
CALL IO_FIELD_CREATE( TPFILE, TZFIELD_X0 )
-TZFIELD_Y0 = TFIELDMETADATA( &
- CMNHNAME = 'Y0', &
- CSTDNAME = '', &
- CLONGNAME = 'Y0', &
- CUNITS = 'km', &
- CDIR = 'XY', &
- CCOMMENT = 'X_Y_Z_Y0', &
- NGRID = 1, &
- NTYPE = TYPEREAL, &
- NDIMS = 4, &
+TZFIELD_Y0 = TFIELDMETADATA( &
+ CMNHNAME = 'Y_TRAJ', &
+ CSTDNAME = '', &
+ CLONGNAME = 'Y_TRAJ', &
+ CUNITS = 'km', &
+ CDIR = 'XY', &
+ CCOMMENT = 'X_Y_Z_Y_TRAJ', &
+ NGRID = 1, &
+ NTYPE = TYPEREAL, &
+ NDIMS = 4, &
NDIMLIST = [ NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_LEVEL, NMNHDIM_TRAJ_TIME ] )
CALL IO_FIELD_CREATE( TPFILE, TZFIELD_Y0 )
-TZFIELD_Z0 = TFIELDMETADATA( &
- CMNHNAME = 'Z0', &
- CSTDNAME = '', &
- CLONGNAME = 'Z0', &
- CUNITS = 'km', &
- CDIR = 'XY', &
- CCOMMENT = 'X_Y_Z_Z0', &
- NGRID = 1, &
- NTYPE = TYPEREAL, &
- NDIMS = 4, &
+TZFIELD_Z0 = TFIELDMETADATA( &
+ CMNHNAME = 'Z_TRAJ', &
+ CSTDNAME = '', &
+ CLONGNAME = 'Z0', &
+ CUNITS = 'km', &
+ CDIR = 'XY', &
+ CCOMMENT = 'X_Y_Z_Z_TRAJ', &
+ NGRID = 1, &
+ NTYPE = TYPEREAL, &
+ NDIMS = 4, &
NDIMLIST = [ NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_LEVEL, NMNHDIM_TRAJ_TIME ] )
CALL IO_FIELD_CREATE( TPFILE, TZFIELD_Z0 )
-TZFIELD_TH0 = TFIELDMETADATA( &
- CMNHNAME = 'TH0', &
- CSTDNAME = '', &
- CLONGNAME = 'TH0', &
- CUNITS = 'K', &
- CDIR = 'XY', &
- CCOMMENT = 'X_Y_Z_'//'TH0', &
- NGRID = 1, &
- NTYPE = TYPEREAL, &
- NDIMS = 4, &
+TZFIELD_TH0 = TFIELDMETADATA( &
+ CMNHNAME = 'THT_TRAJ', &
+ CSTDNAME = '', &
+ CLONGNAME = 'THT_TRAJ', &
+ CUNITS = 'K', &
+ CDIR = 'XY', &
+ CCOMMENT = 'X_Y_Z_'//'THT_TRAJ', &
+ NGRID = 1, &
+ NTYPE = TYPEREAL, &
+ NDIMS = 4, &
NDIMLIST = [ NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_LEVEL, NMNHDIM_TRAJ_TIME ] )
CALL IO_FIELD_CREATE( TPFILE, TZFIELD_TH0 )
-TZFIELD_RV0 = TFIELDMETADATA( &
- CMNHNAME = 'RV0', &
- CSTDNAME = '', &
- CLONGNAME = 'RV0', &
- CUNITS = 'g kg-1', &
- CDIR = 'XY', &
- CCOMMENT = 'X_Y_Z_'//'RV0', &
- NGRID = 1, &
- NTYPE = TYPEREAL, &
- NDIMS = 4, &
+TZFIELD_RV0 = TFIELDMETADATA( &
+ CMNHNAME = 'MRV_TRAJ', &
+ CSTDNAME = '', &
+ CLONGNAME = 'MRV_TRAJ', &
+ CUNITS = 'g kg-1', &
+ CDIR = 'XY', &
+ CCOMMENT = 'X_Y_Z_'//'MRV_TRAJ', &
+ NGRID = 1, &
+ NTYPE = TYPEREAL, &
+ NDIMS = 4, &
NDIMLIST = [ NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_LEVEL, NMNHDIM_TRAJ_TIME ] )
CALL IO_FIELD_CREATE( TPFILE, TZFIELD_RV0 )
diff --git a/src/MNH/diag.f90 b/src/MNH/diag.f90
index 143696420..3b97b1046 100644
--- a/src/MNH/diag.f90
+++ b/src/MNH/diag.f90
@@ -111,6 +111,7 @@ USE MODD_GR_FIELD_n
USE MODD_GRID, ONLY: XLONORI, XLATORI
USE MODD_GRID_n
USE MODD_IO, ONLY: NIO_VERB, NVERB_DEBUG, TFILEDATA, TFILE_SURFEX
+USE MODD_LAGR_TRAJ
USE MODD_LBC_n
USE MODD_LES
USE MODD_LES_BUDGET
@@ -132,7 +133,6 @@ USE MODD_RADAR
USE MODD_RADIATIONS_n
USE MODD_REF_n
USE MODD_STATION_n
-USE MODD_STO_FILE
USE MODD_TIME
USE MODD_TIME_n
USE MODD_TURB_n
diff --git a/src/MNH/modd_sto_file.f90 b/src/MNH/modd_lagr_traj.f90
similarity index 95%
rename from src/MNH/modd_sto_file.f90
rename to src/MNH/modd_lagr_traj.f90
index 34c758701..d37815a19 100644
--- a/src/MNH/modd_sto_file.f90
+++ b/src/MNH/modd_lagr_traj.f90
@@ -8,7 +8,7 @@
! P. Wautelet 15/02/2024: add time dimension for Lagrangian trajectories
!-----------------------------------------------------------------
!###################
-MODULE MODD_STO_FILE
+MODULE MODD_LAGR_TRAJ
!###################
USE MODD_PARAMETERS, ONLY: NFILENAMELGTMAX
@@ -22,4 +22,4 @@ INTEGER :: NSTART_SUPP(100) ! supplementary starts for th
INTEGER :: NTRAJSTLG = 0 ! Number of time starts for Lagrangian trajectories
TYPE(DATE_TIME), DIMENSION(:), ALLOCATABLE :: TLAGR_DATES ! Times for Lagrangian trajectories
-END MODULE MODD_STO_FILE
+END MODULE MODD_LAGR_TRAJ
--
GitLab