diff --git a/src/SURFEX/build_emisstabn.F90 b/src/SURFEX/build_emisstabn.F90
index 48b4dc5b2e46c4bb736f171a7542a52e3c517c6a..5a8ecc2a0d7992b508c58f8d6a6c34edec795240 100644
--- a/src/SURFEX/build_emisstabn.F90
+++ b/src/SURFEX/build_emisstabn.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -110,13 +110,13 @@ ALLOCATE (PCONVERSION(SIZE(PRHODREF,1)))
! determine the conversion factor
PCONVERSION(:) = 1.
SELECT CASE (YUNIT)
-CASE ('MIX') ! flux given ppp*m/s, conversion to molec/m2/s
-! where 1 molecule/cm2/s = (224.14/6.022136E23) ppp*m/s
+CASE ('MIX') ! flux given ppv*m/s, conversion to molec/m2/s
+! where 1 molecule/cm2/s = (224.14/6.022136E23) ppv*m/s
PCONVERSION(:) = XAVOGADRO * PRHODREF(:) / XMD
CASE ('CON') ! flux given in molecules/cm2/s, conversion to molec/m2/s
PCONVERSION(:) = 1E4
CASE ('MOL') ! flux given in microMol/m2/day, conversion to molec/m2/s
-! where 1 microMol/m2/day = (22.414/86.400)*1E-12 ppp*m/s
+! where 1 microMol/m2/day = (22.414/86.400)*1E-12 ppv*m/s
!XCONVERSION(:) = (22.414/86.400)*1E-12 * XAVOGADRO * PRHODREF(:) / XMD
PCONVERSION(:) = 1E-6 * XAVOGADRO / 86400.
diff --git a/src/SURFEX/ch_aer_emission.F90 b/src/SURFEX/ch_aer_emission.F90
index 3aba32d7f500bb6e5fa41848dc9aeab6e61ea643..eb3ad3af3bada4e17ab3dd090f7352d798c9c821 100644
--- a/src/SURFEX/ch_aer_emission.F90
+++ b/src/SURFEX/ch_aer_emission.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -249,7 +249,7 @@ ZFM(:,3) = ZFM(:,1) * (ZEMISRADIUSI**6) *EXP(18 *(LOG(XEMISSIGI))**2)
!
ZFM(:,6) = ZFM(:,4) * (ZEMISRADIUSJ**6) *EXP(18 *(LOG(XEMISSIGJ))**2)
!
-!* 1.4 conversion en ppp.m.s-1
+!* 1.4 conversion en ppv.m.s-1
!
! conversion in atmospheric unit only for moments 0 and 6
PFLUX(:,I_CH_M0i) = ZFM(:,1) * 1E-6 / (ZDEN2MOL * PRHODREF(:))
@@ -275,7 +275,7 @@ PFLUX(:,I_CH_BCj) = PFLUX(:,I_CH_BCj) * ZCONVERSION(:) / (ZMI(JP_AER_BC)*1E-3)
PFLUX(:,I_CH_DSTi) = PFLUX(:,I_CH_DSTi) * ZCONVERSION(:) / (ZMI(JP_AER_DST)*1E-3)
PFLUX(:,I_CH_DSTj) = PFLUX(:,I_CH_DSTj) * ZCONVERSION(:) / (ZMI(JP_AER_DST)*1E-3)
!
-! conversion M0 and M6 ppp.m.s-1 into molecules.m-2.s-1
+! conversion M0 and M6 ppv.m.s-1 into molecules.m-2.s-1
PFLUX(:,I_CH_M0i) = PFLUX(:,I_CH_M0i) * ZCONVERSION(:)
PFLUX(:,I_CH_M0j) = PFLUX(:,I_CH_M0j) * ZCONVERSION(:)
!
diff --git a/src/SURFEX/ch_bvocemn.F90 b/src/SURFEX/ch_bvocemn.F90
index 0b3504e362d4855d14cc85bbd7b25260d8703b46..ac823459dca56febcf85dd91076c861cecb1587c 100644
--- a/src/SURFEX/ch_bvocemn.F90
+++ b/src/SURFEX/ch_bvocemn.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -190,7 +190,7 @@ ENDIF
!3.Summation of different contribution for fluxes
!------------------------------------------------
!
-!isoprene in ppp.m.s-1
+!isoprene in ppv.m.s-1
GB%XFISO (:)=(3.0012E-10/3600.) * ( ZFISO_FOR (:) + ZFISO_GRASS(:) + ZFISO_CROP(:) ) + 1E-17
!monoterpenes
GB%XFMONO(:)=(1.5006E-10/3600.) * ( ZFMONO_FOR(:) + ZFMONO_GRASS(:)+ ZFMONO_CROP(:) ) + 1E-17
diff --git a/src/SURFEX/ch_conversion_factor.F90 b/src/SURFEX/ch_conversion_factor.F90
index 31cdb9b3729a95ea5935a27b81a48459f81da491..89d59dea0c33db390ac70e692b429714f226d6d5 100644
--- a/src/SURFEX/ch_conversion_factor.F90
+++ b/src/SURFEX/ch_conversion_factor.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -57,7 +57,7 @@ IF (LHOOK) CALL DR_HOOK('CH_CONVERSION_FACTOR',0,ZHOOK_HANDLE)
! determine the conversion factor
PCONVERSION(:) = 1.
SELECT CASE (HCONVERSION)
- CASE ('MIX') ! flux given ppp*m/s, conversion to molec/m2/s
+ CASE ('MIX') ! flux given ppv*m/s, conversion to molec/m2/s
PCONVERSION(:) = XAVOGADRO * PRHOA(:) / XMD
CASE ('CON') ! flux given in molecules/cm2/s, conversion to molec/m2/s
PCONVERSION(:) = 1E4
diff --git a/src/SURFEX/ch_emission_fluxn.F90 b/src/SURFEX/ch_emission_fluxn.F90
index f9eae54518a9396b0c73cce922894b0fad2493f7..f12a9bae34ddbff5a878fddb134e34f7e9f039ce 100644
--- a/src/SURFEX/ch_emission_fluxn.F90
+++ b/src/SURFEX/ch_emission_fluxn.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 2000-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2000-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -80,7 +80,7 @@ TYPE(CH_SURF_t), INTENT(INOUT) :: CHU
REAL, INTENT(IN) :: PSIMTIME ! time of simulation in sec UTC
! (counting from midnight of
! the current day)
-REAL,DIMENSION(:,:), INTENT(INOUT) :: PSFSV ! emission flux in ppp*m/s
+REAL,DIMENSION(:,:), INTENT(INOUT) :: PSFSV ! emission flux in ppv*m/s
REAL, DIMENSION(:), INTENT(IN) :: PRHOA ! air density (kg/m3)
REAL, INTENT(IN) :: PTSTEP ! atmospheric time-step (s)
INTEGER, INTENT(IN) :: KNBTS_MAX !max size of TEMISS%NETIMES
diff --git a/src/SURFEX/modd_gr_biog_gardenn.F90 b/src/SURFEX/modd_gr_biog_gardenn.F90
index 1849ecf631f149accf16225a5a965bef1d7cefbd..55097e16b670746f9360ce0ee21127fcca169ac4 100644
--- a/src/SURFEX/modd_gr_biog_gardenn.F90
+++ b/src/SURFEX/modd_gr_biog_gardenn.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -44,8 +44,8 @@ TYPE GR_BIOG_GARDEN_t
!* Radiation at different level(cf Gauss) in the canopy
REAL, DIMENSION(:,:,:),POINTER ::XIACAN ! PAR at 3 gauss level for each patch
!
-!* XFISO = isoprene emission flux (ppp.m.s-1)
-! XFMONO = monoterpenes emission flux (ppp m s-1)
+!* XFISO = isoprene emission flux (ppv.m.s-1)
+! XFMONO = monoterpenes emission flux (ppv m s-1)
REAL, DIMENSION(:), POINTER :: XFISO, XFMONO
!
!
diff --git a/src/SURFEX/modd_gr_biog_greenroofn.F90 b/src/SURFEX/modd_gr_biog_greenroofn.F90
index 4f861e10e9044d568beb0d13f9eb7dd19a8232c8..6b87cb20d822fb60ec72d377827adcfd16f48d1d 100644
--- a/src/SURFEX/modd_gr_biog_greenroofn.F90
+++ b/src/SURFEX/modd_gr_biog_greenroofn.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -45,8 +45,8 @@ TYPE GR_BIOG_GREENROOF_t
REAL, DIMENSION(:), POINTER :: XP_IACAN !pack radiation
REAL, DIMENSION(:,:,:),POINTER ::XIACAN ! PAR at 3 gauss level for each patch
!
-!* XFISO = isoprene emission flux (ppp.m.s-1)
-! XFMONO = monoterpenes emission flux (ppp m s-1)
+!* XFISO = isoprene emission flux (ppv.m.s-1)
+! XFMONO = monoterpenes emission flux (ppv m s-1)
REAL, DIMENSION(:), POINTER :: XFISO, XFMONO
!
!
diff --git a/src/SURFEX/modd_gr_biogn.F90 b/src/SURFEX/modd_gr_biogn.F90
index 9090cc3f7f2b6108d597a5a04b1b00f992ed7dd5..a6c1477d4840f8be83da27b8fdfabc0faeb56c04 100644
--- a/src/SURFEX/modd_gr_biogn.F90
+++ b/src/SURFEX/modd_gr_biogn.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -44,8 +44,8 @@ TYPE GR_BIOG_t
!* Radiation at different level(cf Gauss) in the canopy
REAL, DIMENSION(:,:),POINTER ::XIACAN ! PAR at 3 gauss level for each patch
!
-!* XFISO = isoprene emission flux (ppp.m.s-1)
-! XFMONO = monoterpenes emission flux (ppp m s-1)
+!* XFISO = isoprene emission flux (ppv.m.s-1)
+! XFMONO = monoterpenes emission flux (ppv m s-1)
REAL, DIMENSION(:), POINTER :: XFISO, XFMONO
!SOILNOX
REAL, DIMENSION(:), POINTER :: XNOFLUX
diff --git a/src/SURFEX/mode_aer_surf.F90 b/src/SURFEX/mode_aer_surf.F90
index a23ac0cdb8bb8f53f88d4f3148a08d0dead73d78..e70fa26ef78a32266aef76bd2bcf6960f48960a1 100644
--- a/src/SURFEX/mode_aer_surf.F90
+++ b/src/SURFEX/mode_aer_surf.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -7,7 +7,7 @@ MODULE MODE_AER_SURF
!! ########################
!!
!! MODULE DUST PSD (Particle Size Distribution)
-!! Purpose: Contains subroutines to convert from transported variables (ppp)
+!! Purpose: Contains subroutines to convert from transported variables (ppv)
!! to understandable aerosol variables, e.g. #/m3, kg/m3, sigma, R_{n}
!-------------------------------------------------------------------------------
!! MODIFICATIONS
@@ -147,7 +147,7 @@ END SUBROUTINE INIT_VAR
!
!! ############################################################
SUBROUTINE PPP2AERO_SURF( &
- PSVT, &!I [ppp] input scalar variables (moment of distribution)
+ PSVT, &!I [ppv] input scalar variables (moment of distribution)
PRHODREF, &!I [kg/m3] density of air
PSIG1D, &!O [-] standard deviation of aerosol distribution
PRG1D, &!O [um] number median diameter of aerosol distribution
@@ -160,7 +160,7 @@ SUBROUTINE PPP2AERO_SURF( &
!!
!! PURPOSE
!! -------
-!! Translate the three moments M0, M3 and M6 given in ppp into
+!! Translate the three moments M0, M3 and M6 given in ppv into
!! Values which can be understood more easily (R, sigma, N, M)
!!
!! CALLING STRUCTURE NOTE: OPTIONAL VARIABLES
@@ -353,7 +353,7 @@ IF (LHOOK) CALL DR_HOOK('MODE_AER_SURF:PPP2AERO_SURF',1,ZHOOK_HANDLE)
END SUBROUTINE PPP2AERO_SURF
!! ############################################################
SUBROUTINE AERO2PPP_SURF( &
- PSVT, &!IO [ppp] input scalar variables (moment of distribution)
+ PSVT, &!IO [ppv] input scalar variables (moment of distribution)
PRHODREF, &!I [kg/m3] density of air
PSIG1D, &!I [-] standard deviation of aerosol distribution
PRG1D &!I [um] number median diameter of aerosol distribution
@@ -363,7 +363,7 @@ SUBROUTINE AERO2PPP_SURF( &
!!
!! PURPOSE
!! -------
-!! Translate the aerosol Mass, RG and SIGMA in the three moments M0, M3 and M6 given in ppp
+!! Translate the aerosol Mass, RG and SIGMA in the three moments M0, M3 and M6 given in ppv
!!
!! REFERENCE
!! ---------
@@ -440,7 +440,7 @@ ZM(:,4)= ZM(:,5)/ ( (PRG1D(:,2)**3)*EXP(4.5 * LOG(PSIG1D(:,2))**2) )
ZM(:,3) = ZM(:,1)*(PRG1D(:,1)**6) * EXP(18 *(LOG(PSIG1D(:,1)))**2)
ZM(:,6) = ZM(:,4)*(PRG1D(:,2)**6) * EXP(18 *(LOG(PSIG1D(:,2)))**2)
!
-!* 6 return to ppp
+!* 6 return to ppv
!
PSVT(:,JP_CH_M0i) = ZM(:,1) * 1E-6
PSVT(:,JP_CH_M0j) = ZM(:,4) * 1E-6
diff --git a/src/SURFEX/mode_dslt_surf.F90 b/src/SURFEX/mode_dslt_surf.F90
index 408f179f1c2fea06682802fac0b1df65a26c53c1..742a4de2fc6c6e5e2d21e1d66052f1df15156b82 100644
--- a/src/SURFEX/mode_dslt_surf.F90
+++ b/src/SURFEX/mode_dslt_surf.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
!SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!SFX_LIC for details. version 1.
@@ -188,7 +188,7 @@ SUBROUTINE DSLTMOMENT2SIZE( &
!!
!! PURPOSE
!! -------
-!! Translate the three moments M0, M3 and M6 given in ppp into
+!! Translate the three moments M0, M3 and M6 given in ppv into
!! Values which can be understood more easily (R, sigma, N, M)
!! At this point, M3 is in kg/m3, M0 in #/m3*(kg_{dst}/mole), M6 in um6/m3*1.d6*(kg_{dst}/mole)
!!
@@ -225,7 +225,7 @@ IMPLICIT NONE
!* 0.1 declarations of arguments
!
!INPUT
-REAL, DIMENSION(:,:), INTENT(IN) :: PSVT !I [ppp] moments in surface units
+REAL, DIMENSION(:,:), INTENT(IN) :: PSVT !I [ppv] moments in surface units
REAL, DIMENSION(:), INTENT(IN) :: PRHODREF !I [kg/m3] density of air
REAL, DIMENSION(:), INTENT(IN) :: PEMISSIG
REAL, DIMENSION(:), INTENT(IN) :: PEMISRADIUS