From 41145c8d3f5167116e0691c79f9b10ae9fe3c8e8 Mon Sep 17 00:00:00 2001 From: Juan Escobar <escj@aero.obs-mip.fr> Date: Fri, 18 Nov 2016 16:40:57 +0100 Subject: [PATCH] Revert "M.Leriche 11/2016 , minor comment & space fix" This reverts commit d40b050a9ee207fcf8b17dea8b5a24a2b6b4b256. --- src/MNH/goto_model_wrapper.f90 | 1 + src/MNH/ground_paramn.f90 | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/MNH/goto_model_wrapper.f90 b/src/MNH/goto_model_wrapper.f90 index 82f382943..da89c864a 100644 --- a/src/MNH/goto_model_wrapper.f90 +++ b/src/MNH/goto_model_wrapper.f90 @@ -14,6 +14,7 @@ !! 07/13 (Bosseur & Filippi) adds Forefire !! 2014 (Faivre) !! 2016 (Leriche) Add MODD_CH_ICE Suppress MODD_CH_DEP_n +!! Modification 01/2016 (JP Pinty) Add LIMA !----------------------------------------------------------------- MODULE MODI_GOTO_MODEL_WRAPPER diff --git a/src/MNH/ground_paramn.f90 b/src/MNH/ground_paramn.f90 index 134958078..08f467926 100644 --- a/src/MNH/ground_paramn.f90 +++ b/src/MNH/ground_paramn.f90 @@ -90,21 +90,21 @@ END MODULE MODI_GROUND_PARAM_n !! recomputes z0 where snow is. !! pack and unpack of 2D fields into 1D fields !! (V.Masson) 04/01/00 removes the TSZ0 case -!! (F.Solmon/V.Masson) adapatation for patch approach -!! modification of internal subroutine pack/ allocation in function -!! of patch indices -!! calling of isba for each defined patch -!! averaging of patch fluxes to get nat fluxes -!! (P. Tulet/G.Guenais) 04/02/01 separation of vegetatives class -!! for friction velocity and aerodynamical resistance -!! (S Donnier) 09/12/02 add specific humidity at 2m for diagnostic -!! (V.Masson) 01/03/03 externalisation of the surface schemes! -!! (P.Tulet ) 01/11/03 externalisation of the surface chemistry! -!! (D.Gazen) 01/12/03 change emissions handling for surf. externalization -!! (J.escobar) 18/10/2012 missing USE MODI_COUPLING_SURF_ATM_n & MODI_DIAG_SURF_ATM_n -!! (J.escobar) 2/2014 add Forefire coupling +! (F.Solmon/V.Masson) adapatation for patch approach +! modification of internal subroutine pack/ allocation in function +! of patch indices +! calling of isba for each defined patch +! averaging of patch fluxes to get nat fluxes +! (P. Tulet/G.Guenais) 04/02/01 separation of vegetatives class +! for friction velocity and +! aerodynamical resistance +! (S Donnier) 09/12/02 add specific humidity at 2m for diagnostic +! (V.Masson) 01/03/03 externalisation of the surface schemes! +! (P.Tulet ) 01/11/03 externalisation of the surface chemistry! +!! (D.Gazen) 01/12/03 change emissions handling for surf. externalization +!! (J.escobar) 18/10/2012 missing USE MODI_COUPLING_SURF_ATM_n & MODI_DIAG_SURF_ATM_n +! (J.escobar) 2/2014 add Forefire coupling !! (M.Leriche) 24/03/16 remove flag for chemical surface fluxes -!! !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -134,7 +134,7 @@ USE MODD_GRID, ONLY : XLON0, XRPK, XBETA USE MODD_PARAM_ICE, ONLY : LSEDIC USE MODD_PARAM_C2R2, ONLY : LSEDC USE MODD_DIAG_IN_RUN -USE MODD_DUST, ONLY : LDUST +USE MODD_DUST, ONLY : LDUST USE MODD_SALT, ONLY : LSALT USE MODD_CH_AEROSOL, ONLY : LORILAM USE MODD_CSTS_DUST, ONLY : XMOLARWEIGHT_DUST -- GitLab