From dedacdf75e4f21c1947bff747b29eb195f7b86a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Riette?= <sebastien.riette@meteo.fr> Date: Mon, 17 Apr 2023 16:10:26 +0200 Subject: [PATCH] S. Riette 17 Apr 2023: ini_lima converted in mode --- src/arome/gmkpack_ignored_files | 3 +++ src/common/micro/mode_ini_lima.F90 | 2 ++ ...ld_mixed.F90 => mode_ini_lima_cold_mixed.F90} | 15 +++++---------- ...{ini_lima_warm.F90 => mode_ini_lima_warm.F90} | 16 +++++----------- 4 files changed, 15 insertions(+), 21 deletions(-) rename src/common/micro/{ini_lima_cold_mixed.F90 => mode_ini_lima_cold_mixed.F90} (99%) rename src/common/micro/{ini_lima_warm.F90 => mode_ini_lima_warm.F90} (97%) diff --git a/src/arome/gmkpack_ignored_files b/src/arome/gmkpack_ignored_files index a82bb867c..a1ec2dc01 100644 --- a/src/arome/gmkpack_ignored_files +++ b/src/arome/gmkpack_ignored_files @@ -298,3 +298,6 @@ phyex/micro/ini_lima.F90 phyex/micro/init_aerosol_properties.F90 mpa/micro/interface/aroini_cstmnh.h mpa/micro/externals/aroini_cstmnh.F90 +phyex/micro/ini_lima_cold_mixed.F90 +phyex/micro/ini_lima_warm.F90 + diff --git a/src/common/micro/mode_ini_lima.F90 b/src/common/micro/mode_ini_lima.F90 index c0154544e..5c834e5c7 100644 --- a/src/common/micro/mode_ini_lima.F90 +++ b/src/common/micro/mode_ini_lima.F90 @@ -39,6 +39,8 @@ CONTAINS USE MODD_CST USE MODD_PARAM_LIMA USE MODD_PARAMETERS +USE MODE_INI_LIMA_WARM, ONLY: INI_LIMA_WARM +USE MODE_INI_LIMA_COLD_MIXED, ONLY: INI_LIMA_COLD_MIXED !USE MODD_LUNIT, ONLY : TLUOUT0 ! IMPLICIT NONE diff --git a/src/common/micro/ini_lima_cold_mixed.F90 b/src/common/micro/mode_ini_lima_cold_mixed.F90 similarity index 99% rename from src/common/micro/ini_lima_cold_mixed.F90 rename to src/common/micro/mode_ini_lima_cold_mixed.F90 index 5a7a4a0d4..0de664547 100644 --- a/src/common/micro/ini_lima_cold_mixed.F90 +++ b/src/common/micro/mode_ini_lima_cold_mixed.F90 @@ -4,20 +4,13 @@ !MNH_LIC for details. version 1. !----------------------------------------------------------------- ! ############################### - MODULE MODI_INI_LIMA_COLD_MIXED + MODULE MODE_INI_LIMA_COLD_MIXED ! ############################### ! -INTERFACE - SUBROUTINE INI_LIMA_COLD_MIXED (PTSTEP, PDZMIN) -! -REAL, INTENT(IN) :: PTSTEP ! Effective Time step -REAL, INTENT(IN) :: PDZMIN ! minimun vertical mesh size -! -END SUBROUTINE INI_LIMA_COLD_MIXED +IMPLICIT NONE ! -END INTERFACE +CONTAINS ! -END MODULE MODI_INI_LIMA_COLD_MIXED ! ############################################### SUBROUTINE INI_LIMA_COLD_MIXED (PTSTEP, PDZMIN) ! ############################################### @@ -1778,3 +1771,5 @@ XFREFFI = 0.5 * ZGAMI(8) * (1.0/XLBI)**XLBEXI !------------------------------------------------------------------------------ ! END SUBROUTINE INI_LIMA_COLD_MIXED +! +END MODULE MODE_INI_LIMA_COLD_MIXED diff --git a/src/common/micro/ini_lima_warm.F90 b/src/common/micro/mode_ini_lima_warm.F90 similarity index 97% rename from src/common/micro/ini_lima_warm.F90 rename to src/common/micro/mode_ini_lima_warm.F90 index f42398d59..d46bd2d6b 100644 --- a/src/common/micro/ini_lima_warm.F90 +++ b/src/common/micro/mode_ini_lima_warm.F90 @@ -4,20 +4,12 @@ !MNH_LIC for details. version 1. !----------------------------------------------------------------- ! ######################### - MODULE MODI_INI_LIMA_WARM + MODULE MODE_INI_LIMA_WARM ! ######################### ! -INTERFACE - SUBROUTINE INI_LIMA_WARM (PTSTEP, PDZMIN) -! -REAL, INTENT(IN) :: PTSTEP ! Effective Time step -REAL, INTENT(IN) :: PDZMIN ! minimun vertical mesh size -! -END SUBROUTINE INI_LIMA_WARM -! -END INTERFACE +IMPLICIT NONE ! -END MODULE MODI_INI_LIMA_WARM +CONTAINS ! ######################################### SUBROUTINE INI_LIMA_WARM (PTSTEP, PDZMIN) ! ######################################### @@ -474,3 +466,5 @@ XCRER = 1.0/ (ZGAMR(6) * XAR**(2.0/3.0)) !------------------------------------------------------------------------------ ! END SUBROUTINE INI_LIMA_WARM +! +END MODULE MODE_INI_LIMA_WARM -- GitLab