Quentin 20/01/2022: bugfix of last commit modd_XXXn must not contain TYPE...

Quentin 20/01/2022: bugfix of last commit modd_XXXn must not contain TYPE exchange of MNH gridnesting : modd_turbn iwas for now the only one used in the code (so OK for the other modd_XXXXn not used)

src/common/aux/modd_turbn.F90

@@ -49,8 +49,6 @@
 !
 USE MODD_PARAMETERS, ONLY: JPMODELMAX
 IMPLICIT NONE
-
-TYPE TURB_t
 ! 
 ! 
   REAL               :: XIMPL     ! implicitness degree for the vertical terms of 
@@ -107,105 +105,4 @@ TYPE TURB_t
                                    ! negative value : applied everywhere
                                    ! 0.000001 applied only inside the clouds ri+rc > 10**-6 kg/kg
 !
-END TYPE TURB_t
-
-TYPE(TURB_t), DIMENSION(JPMODELMAX), TARGET, SAVE :: TURB_MODEL
-
-REAL, POINTER :: XIMPL=>NULL()
-REAL, POINTER :: XKEMIN=>NULL()
-REAL, POINTER :: XCEDIS=>NULL()
-REAL, POINTER :: XCADAP=>NULL()
-CHARACTER (LEN=4), POINTER :: CTURBLEN=>NULL()
-CHARACTER (LEN=4), POINTER :: CTURBDIM=>NULL()
-LOGICAL, POINTER :: LTURB_FLX=>NULL()
-LOGICAL, POINTER :: LTURB_DIAG=>NULL()
-LOGICAL, POINTER :: LSUBG_COND=>NULL()
-LOGICAL, POINTER :: LSIGMAS=>NULL()
-LOGICAL, POINTER :: LSIG_CONV=>NULL()
-LOGICAL, POINTER :: LRMC01=>NULL()
-CHARACTER(LEN=4),POINTER :: CTOM=>NULL()
-CHARACTER(LEN=4),POINTER :: CSUBG_AUCV=>NULL()
-CHARACTER(LEN=80),POINTER :: CSUBG_AUCV_RI=>NULL()
-CHARACTER(LEN=80),POINTER :: CCONDENS=>NULL()
-CHARACTER(LEN=4),POINTER :: CLAMBDA3=>NULL()
-CHARACTER(LEN=80),POINTER :: CSUBG_MF_PDF=>NULL()
-REAL, DIMENSION(:,:), POINTER :: XBL_DEPTH=>NULL()
-REAL, DIMENSION(:,:), POINTER :: XSBL_DEPTH=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XWTHVMF=>NULL()
-REAL, POINTER :: VSIGQSAT=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XDYP=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XTHP=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XTR=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XDISS=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XLEM=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XSSUFL_C=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XSSVFL_C=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XSSTFL_C=>NULL()
-REAL, DIMENSION(:,:,:), POINTER :: XSSRFL_C=>NULL()
-LOGICAL, POINTER :: LHGRAD=>NULL()
-REAL, POINTER :: XCOEFHGRADTHL=>NULL()
-REAL, POINTER :: XCOEFHGRADRM=>NULL()
-REAL, POINTER :: XALTHGRAD=>NULL()
-REAL, POINTER :: XCLDTHOLD=>NULL()
-
-CONTAINS
-
-SUBROUTINE TURB_GOTO_MODEL(KFROM, KTO)
-INTEGER, INTENT(IN) :: KFROM, KTO
-!
-! Save current state for allocated arrays
-!
-!TURB_MODEL(KFROM)%XBL_DEPTH=>XBL_DEPTH !Done in FIELDLIST_GOTO_MODEL
-!TURB_MODEL(KFROM)%XSBL_DEPTH=>XSBL_DEPTH !Done in FIELDLIST_GOTO_MODEL
-!TURB_MODEL(KFROM)%XWTHVMF=>XWTHVMF !Done in FIELDLIST_GOTO_MODEL
-TURB_MODEL(KFROM)%XDYP=>XDYP 
-TURB_MODEL(KFROM)%XTHP=>XTHP 
-TURB_MODEL(KFROM)%XTR=>XTR 
-TURB_MODEL(KFROM)%XDISS=>XDISS
-TURB_MODEL(KFROM)%XLEM=>XLEM
-TURB_MODEL(KFROM)%XSSUFL_C=>XSSUFL_C
-TURB_MODEL(KFROM)%XSSVFL_C=>XSSVFL_C
-TURB_MODEL(KFROM)%XSSTFL_C=>XSSTFL_C
-TURB_MODEL(KFROM)%XSSRFL_C=>XSSRFL_C
-!
-! Current model is set to model KTO
-XIMPL=>TURB_MODEL(KTO)%XIMPL
-XKEMIN=>TURB_MODEL(KTO)%XKEMIN
-XCEDIS=>TURB_MODEL(KTO)%XCEDIS
-XCADAP=>TURB_MODEL(KTO)%XCADAP
-CTURBLEN=>TURB_MODEL(KTO)%CTURBLEN
-CTURBDIM=>TURB_MODEL(KTO)%CTURBDIM
-LTURB_FLX=>TURB_MODEL(KTO)%LTURB_FLX
-LTURB_DIAG=>TURB_MODEL(KTO)%LTURB_DIAG
-LSUBG_COND=>TURB_MODEL(KTO)%LSUBG_COND
-LSIGMAS=>TURB_MODEL(KTO)%LSIGMAS
-LSIG_CONV=>TURB_MODEL(KTO)%LSIG_CONV
-LRMC01=>TURB_MODEL(KTO)%LRMC01
-CTOM=>TURB_MODEL(KTO)%CTOM
-CSUBG_AUCV=>TURB_MODEL(KTO)%CSUBG_AUCV
-CSUBG_AUCV_RI=>TURB_MODEL(KTO)%CSUBG_AUCV_RI
-CCONDENS=>TURB_MODEL(KTO)%CCONDENS
-CLAMBDA3=>TURB_MODEL(KTO)%CLAMBDA3
-CSUBG_MF_PDF=>TURB_MODEL(KTO)%CSUBG_MF_PDF
-!XBL_DEPTH=>TURB_MODEL(KTO)%XBL_DEPTH !Done in FIELDLIST_GOTO_MODEL
-!XSBL_DEPTH=>TURB_MODEL(KTO)%XSBL_DEPTH !Done in FIELDLIST_GOTO_MODEL
-!XWTHVMF=>TURB_MODEL(KTO)%XWTHVMF !Done in FIELDLIST_GOTO_MODEL
-VSIGQSAT=>TURB_MODEL(KTO)%VSIGQSAT
-XDYP=>TURB_MODEL(KTO)%XDYP 
-XTHP=>TURB_MODEL(KTO)%XTHP 
-XTR=>TURB_MODEL(KTO)%XTR  
-XDISS=>TURB_MODEL(KTO)%XDISS
-XLEM=>TURB_MODEL(KTO)%XLEM
-XSSUFL_C=>TURB_MODEL(KTO)%XSSUFL_C
-XSSVFL_C=>TURB_MODEL(KTO)%XSSVFL_C
-XSSTFL_C=>TURB_MODEL(KTO)%XSSTFL_C
-XSSRFL_C=>TURB_MODEL(KTO)%XSSRFL_C
-LHGRAD=>TURB_MODEL(KTO)%LHGRAD
-XCOEFHGRADTHL=>TURB_MODEL(KTO)%XCOEFHGRADTHL
-XCOEFHGRADRM=>TURB_MODEL(KTO)%XCOEFHGRADRM
-XALTHGRAD=>TURB_MODEL(KTO)%XALTHGRAD
-XCLDTHOLD=>TURB_MODEL(KTO)%XCLDTHOLD
-
-END SUBROUTINE TURB_GOTO_MODEL
-
 END MODULE MODD_TURB_n