From b7c32220b706074e9ea197e81a1a83cc3cc2ceb9 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Fri, 6 Jan 2023 16:34:49 +0100 Subject: [PATCH] Quentin 06/01/2023: bugfix, PHYEX adapt interfaces : missing module ASSOCIATE() --- src/MNH/ini_radar.f90 | 1 + src/MNH/prep_ideal_case.f90 | 2 ++ src/MNH/prep_real_case.f90 | 2 ++ src/PHYEX/micro/ini_lima_cold_mixed.f90 | 4 +++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/MNH/ini_radar.f90 b/src/MNH/ini_radar.f90 index dbc94a726..77002163b 100644 --- a/src/MNH/ini_radar.f90 +++ b/src/MNH/ini_radar.f90 @@ -82,6 +82,7 @@ CHARACTER (LEN=4), INTENT(IN) :: HPRISTINE_ICE ! Indicator of ice cryst !------------------------------------------------------------------------------- ! ! +CALL RAIN_ICE_DESCR_ASSOCIATE() ! !* 1.1 Raindrop characteristics ! diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90 index 3a340fe6f..ea749bd3c 100644 --- a/src/MNH/prep_ideal_case.f90 +++ b/src/MNH/prep_ideal_case.f90 @@ -337,6 +337,7 @@ USE MODD_GRID_n USE MODD_IBM_LSF, ONLY: CIBM_TYPE, LIBM_LSF, NIBM_SMOOTH, XIBM_SMOOTH USE MODD_IBM_PARAM_n, ONLY: XIBM_LS USE MODD_METRICS_n +USE MODD_LES, ONLY : LES_ASSOCIATE USE MODD_PGDDIM USE MODD_PGDGRID USE MODD_TIME @@ -655,6 +656,7 @@ CALL INI_NEB ! CALL ALLOC_FIELD_SCALARS() CALL PARAM_ICE_ASSOCIATE() +CALL LES_ASSOCIATE() CALL DEFAULT_DESFM_n(1) ! CSURF = "NONE" diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90 index 01b3b16db..385bfd59e 100644 --- a/src/MNH/prep_real_case.f90 +++ b/src/MNH/prep_real_case.f90 @@ -420,6 +420,7 @@ USE MODD_IBM_LSF, ONLY: CIBM_TYPE, LIBM_LSF, NIBM_SMOOTH, XIBM_SMOOTH USE MODD_IBM_PARAM_n, ONLY: XIBM_LS USE MODD_IO, ONLY: TFILEDATA, TFILE_SURFEX USE MODD_LBC_n +USE MODD_LES, ONLY: LES_ASSOCIATE USE MODD_LSFIELD_n USE MODD_LUNIT, ONLY: TPGDFILE,TLUOUT0,TOUTDATAFILE USE MODD_LUNIT_n, ONLY: CINIFILE,TINIFILE,TLUOUT @@ -614,6 +615,7 @@ CPROGRAM='REAL ' ! CALL ALLOC_FIELD_SCALARS() CALL PARAM_ICE_ASSOCIATE() +CALL LES_ASSOCIATE() CALL DEFAULT_DESFM_n(1) NRR=1 IDX_RVT = 1 diff --git a/src/PHYEX/micro/ini_lima_cold_mixed.f90 b/src/PHYEX/micro/ini_lima_cold_mixed.f90 index c06c29212..e8af15d58 100644 --- a/src/PHYEX/micro/ini_lima_cold_mixed.f90 +++ b/src/PHYEX/micro/ini_lima_cold_mixed.f90 @@ -57,7 +57,8 @@ USE MODD_PARAM_LIMA USE MODD_PARAM_LIMA_WARM USE MODD_PARAM_LIMA_COLD USE MODD_PARAM_LIMA_MIXED -use MODD_RAIN_ICE_PARAM, only: XALPHA1, XALPHA2, XBETA1, XBETA2, IMNU0=>XMNU0, XNU10, XNU20 +USE MODD_RAIN_ICE_PARAM, ONLY: XALPHA1, XALPHA2, XBETA1, XBETA2, IMNU0=>XMNU0, XNU10, XNU20, & + RAIN_ICE_PARAM_ASSOCIATE USE MODD_REF ! use mode_msg @@ -155,6 +156,7 @@ ILUOUT0 = TLUOUT0%NLU !* 1. CHARACTERISTICS OF THE SPECIES ! ------------------------------ ! +CALL RAIN_ICE_PARAM_ASSOCIATE() ! !* 1.2 Ice crystal characteristics ! -- GitLab