From 0d05cfcdafd92a540e26d94e828f250e2152c9ea Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 1 Jul 2021 15:35:43 +0200
Subject: [PATCH] Philippe 01/07/2021: budgets: add npdf dimension
---
src/LIB/SURCOUCHE/src/modd_field.f90 | 27 +++++++++++----------
src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90 | 7 ++++--
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/modd_field.f90 b/src/LIB/SURCOUCHE/src/modd_field.f90
index bdb77e321..b81b59f1f 100644
--- a/src/LIB/SURCOUCHE/src/modd_field.f90
+++ b/src/LIB/SURCOUCHE/src/modd_field.f90
@@ -65,25 +65,26 @@ integer, parameter :: NMNHDIM_BUDGET_LES_TIME = 24
integer, parameter :: NMNHDIM_BUDGET_LES_AVG_TIME = 25
integer, parameter :: NMNHDIM_BUDGET_LES_LEVEL = 26
integer, parameter :: NMNHDIM_BUDGET_LES_SV = 27
+integer, parameter :: NMNHDIM_BUDGET_LES_PDF = 28
integer, parameter :: NMNHDIM_BUDGET_LES_MASK = 100 ! This is not a true dimension
-integer, parameter :: NMNHDIM_SPECTRA_2PTS_NI = 28
-integer, parameter :: NMNHDIM_SPECTRA_2PTS_NJ = 29
-integer, parameter :: NMNHDIM_SPECTRA_SPEC_NI = 30
-integer, parameter :: NMNHDIM_SPECTRA_SPEC_NJ = 31
-integer, parameter :: NMNHDIM_SPECTRA_LEVEL = 32
+integer, parameter :: NMNHDIM_SPECTRA_2PTS_NI = 29
+integer, parameter :: NMNHDIM_SPECTRA_2PTS_NJ = 30
+integer, parameter :: NMNHDIM_SPECTRA_SPEC_NI = 31
+integer, parameter :: NMNHDIM_SPECTRA_SPEC_NJ = 32
+integer, parameter :: NMNHDIM_SPECTRA_LEVEL = 33
-integer, parameter :: NMNHDIM_SERIES_LEVEL = 33
-integer, parameter :: NMNHDIM_SERIES_LEVEL_W = 34
-integer, parameter :: NMNHDIM_SERIES_TIME = 35 ! Time dimension for time series
+integer, parameter :: NMNHDIM_SERIES_LEVEL = 34
+integer, parameter :: NMNHDIM_SERIES_LEVEL_W = 35
+integer, parameter :: NMNHDIM_SERIES_TIME = 36 ! Time dimension for time series
-integer, parameter :: NMNHDIM_FLYER_TIME = 36 ! Time dimension for aircraft/balloon (dimension local to each flyer)
-integer, parameter :: NMNHDIM_PROFILER_TIME = 37 ! Time dimension for profilers
-integer, parameter :: NMNHDIM_STATION_TIME = 38 ! Time dimension for stations
+integer, parameter :: NMNHDIM_FLYER_TIME = 37 ! Time dimension for aircraft/balloon (dimension local to each flyer)
+integer, parameter :: NMNHDIM_PROFILER_TIME = 38 ! Time dimension for profilers
+integer, parameter :: NMNHDIM_STATION_TIME = 39 ! Time dimension for stations
-integer, parameter :: NMNHDIM_PAIR = 39 ! For values coming by pair (ie boundaries)
+integer, parameter :: NMNHDIM_PAIR = 40 ! For values coming by pair (ie boundaries)
-integer, parameter :: NMNHDIM_LASTDIM_DIACHRO = 39 ! Index of the last defined dimension for diachronic files
+integer, parameter :: NMNHDIM_LASTDIM_DIACHRO = 40 ! Index of the last defined dimension for diachronic files
integer, parameter :: NMNHDIM_BUDGET_NGROUPS = 101 ! This is not a true dimension
integer, parameter :: NMNHDIM_FLYER_PROC = 102 ! This is not a true dimension
diff --git a/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90 b/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
index 9804348f8..477c389db 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_tools_nc4.f90
@@ -261,7 +261,7 @@ use modd_field, only: NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_NI_U, NMNHDIM_NJ_U
NMNHDIM_BUDGET_MASK_LEVEL, NMNHDIM_BUDGET_MASK_LEVEL_W, &
NMNHDIM_BUDGET_MASK_NBUMASK, NMNHDIM_BUDGET_TIME, &
NMNHDIM_BUDGET_LES_TIME, NMNHDIM_BUDGET_LES_AVG_TIME, NMNHDIM_BUDGET_LES_LEVEL, &
- NMNHDIM_BUDGET_LES_SV, &
+ NMNHDIM_BUDGET_LES_SV, NMNHDIM_BUDGET_LES_PDF, &
NMNHDIM_SPECTRA_2PTS_NI, NMNHDIM_SPECTRA_2PTS_NJ, &
NMNHDIM_SPECTRA_SPEC_NI, NMNHDIM_SPECTRA_SPEC_NJ, NMNHDIM_SPECTRA_LEVEL, &
NMNHDIM_SERIES_LEVEL, NMNHDIM_SERIES_LEVEL_W, &
@@ -270,7 +270,7 @@ use modd_field, only: NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_NI_U, NMNHDIM_NJ_U
NMNHDIM_ARAKAWA, &
NMNHDIM_LASTDIM_NODIACHRO, NMNHDIM_LASTDIM_DIACHRO
-use modd_les, only: nles_k, nspectra_k, xles_temp_mean_start, xles_temp_mean_step, xles_temp_mean_end
+use modd_les, only: lles_pdf, nles_k, npdf, nspectra_k, xles_temp_mean_start, xles_temp_mean_step, xles_temp_mean_end
use modd_les_n, only: nles_times, nspectra_ni, nspectra_nj
use modd_nsv, only: nsv
USE MODD_PARAMETERS_ll, ONLY: JPHEXT, JPVEXT
@@ -377,6 +377,9 @@ if ( tpfile%ctype == 'MNHDIACHRONIC' ) then
!Dimension for the number of scalar variables
if ( nsv > 0 ) call IO_Add_dim_nc4( tpfile, NMNHDIM_BUDGET_LES_SV, 'nsv', nsv )
+ !Dimension for the number of PDF
+ if ( lles_pdf ) call IO_Add_dim_nc4( tpfile, NMNHDIM_BUDGET_LES_PDF, 'npdf', npdf )
+
!Dimensions for the number of horizontal wavelengths for non-local LES budgets (2 points correlations)
if ( nspectra_ni > 0 ) call IO_Add_dim_nc4( tpfile, NMNHDIM_SPECTRA_2PTS_NI, 'nspectra_2pts_ni', nspectra_ni )
if ( nspectra_nj > 0 .and. .not. l2d ) &
--
GitLab