From d2e734e0cf1ee0cf5c20896e414b60577930da83 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Thu, 3 Jun 2021 17:28:59 +0200 Subject: [PATCH] Quentin 03/06/2021: bugfix exchange new global variables of High clouds for grid-nesting. TODO: these variables are not initialized properly in case of RESTART (bit-reproductibility). Need to be written and read --- src/MNH/modd_fieldn.f90 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/MNH/modd_fieldn.f90 b/src/MNH/modd_fieldn.f90 index 278e98521..ad3288ed5 100644 --- a/src/MNH/modd_fieldn.f90 +++ b/src/MNH/modd_fieldn.f90 @@ -124,7 +124,11 @@ TYPE FIELD_t REAL, DIMENSION(:,:) ,POINTER :: XFLUCTWTN=>NULL() !W tangential velocity fluctuations NORTH boundary REAL, DIMENSION(:,:) ,POINTER :: XFLUCTWTE=>NULL() !W tangential velocity fluctuations EAST boundary REAL, DIMENSION(:,:) ,POINTER :: XFLUCTWTS=>NULL() !W tangential velocity fluctuations SOUTH boundary -! + REAL, DIMENSION(:,:,:), POINTER :: XHLC_HRC=>NULL() + REAL, DIMENSION(:,:,:), POINTER :: XHLC_HCF=>NULL() + REAL, DIMENSION(:,:,:), POINTER :: XHLI_HRI=>NULL() + REAL, DIMENSION(:,:,:), POINTER :: XHLI_HCF=>NULL() + ! END TYPE FIELD_t TYPE(FIELD_t), DIMENSION(JPMODELMAX), TARGET, SAVE :: FIELD_MODEL @@ -167,6 +171,11 @@ REAL, DIMENSION(:,:,:), POINTER :: XRCM=>NULL() REAL, DIMENSION(:,:), POINTER :: XFLUCTUNW=>NULL(),XFLUCTVNN=>NULL(),XFLUCTUTN=>NULL(),XFLUCTVTW=>NULL() REAL, DIMENSION(:,:), POINTER :: XFLUCTUNE=>NULL(),XFLUCTVNS=>NULL(),XFLUCTUTS=>NULL(),XFLUCTVTE=>NULL() REAL, DIMENSION(:,:), POINTER :: XFLUCTWTW=>NULL(),XFLUCTWTN=>NULL(),XFLUCTWTE=>NULL(),XFLUCTWTS=>NULL() +REAL, DIMENSION(:,:,:), POINTER :: XHLC_HRC=>NULL() +REAL, DIMENSION(:,:,:), POINTER :: XHLC_HCF=>NULL() +REAL, DIMENSION(:,:,:), POINTER :: XHLI_HRI=>NULL() +REAL, DIMENSION(:,:,:), POINTER :: XHLI_HCF=>NULL() + CONTAINS SUBROUTINE FIELD_GOTO_MODEL(KFROM, KTO) @@ -222,6 +231,10 @@ FIELD_MODEL(KFROM)%XFLUCTWTW=>XFLUCTWTW FIELD_MODEL(KFROM)%XFLUCTWTN=>XFLUCTWTN FIELD_MODEL(KFROM)%XFLUCTWTE=>XFLUCTWTE FIELD_MODEL(KFROM)%XFLUCTWTS=>XFLUCTWTS +FIELD_MODEL(KFROM)%XHLC_HRC=>XHLC_HRC +FIELD_MODEL(KFROM)%XHLC_HCF=>XHLC_HCF +FIELD_MODEL(KFROM)%XHLI_HRI=>XHLI_HRI +FIELD_MODEL(KFROM)%XHLI_HCF=>XHLI_HCF ! ! Current model is set to model KTO !XZWS=>FIELD_MODEL(KTO)%XZWS !Done in FIELDLIST_GOTO_MODEL @@ -272,6 +285,10 @@ XFLUCTWTW=>FIELD_MODEL(KTO)%XFLUCTWTW XFLUCTWTN=>FIELD_MODEL(KTO)%XFLUCTWTN XFLUCTWTE=>FIELD_MODEL(KTO)%XFLUCTWTE XFLUCTWTS=>FIELD_MODEL(KTO)%XFLUCTWTS +XHLC_HRC=>FIELD_MODEL(KTO)%XHLC_HRC +XHLC_HCF=>FIELD_MODEL(KTO)%XHLC_HCF +XHLI_HRI=>FIELD_MODEL(KTO)%XHLI_HRI +XHLI_HCF=>FIELD_MODEL(KTO)%XHLI_HCF END SUBROUTINE FIELD_GOTO_MODEL END MODULE MODD_FIELD_n -- GitLab