diff --git a/src/MNH/goto_model_wrapper.f90 b/src/MNH/goto_model_wrapper.f90 index ffa3d19bf98820ab42915de0e18797fa8232b0c4..1d3e057e3b5745ca58136806b5248925ff85f90d 100644 --- a/src/MNH/goto_model_wrapper.f90 +++ b/src/MNH/goto_model_wrapper.f90 @@ -88,6 +88,7 @@ USE MODD_SERIES_n USE MODD_STATION_n !USE MODD_TIME_n USE MODD_TURB_n +USE MODD_DRAG_n USE MODD_BLOWSNOW_n ! USE MODD_SUB_CH_FIELD_VALUE_n @@ -206,6 +207,7 @@ CALL SUB_PASPOL_GOTO_MODEL(KFROM, KTO) CALL SUB_ELEC_GOTO_MODEL(KFROM, KTO) !CALL TIME_GOTO_MODEL(KFROM, KTO) CALL TURB_GOTO_MODEL(KFROM, KTO) +CALL DRAG_GOTO_MODEL(KFROM, KTO) CALL TIMEZ_GOTO_MODEL(KFROM, KTO) CALL CH_PH_GOTO_MODEL(KFROM, KTO) CALL CH_ICE_GOTO_MODEL(KFROM, KTO) diff --git a/src/MNH/modd_sub_modeln.f90 b/src/MNH/modd_sub_modeln.f90 index 96868a044f15ecefce3c78a61738088f1577397f..86359f8aafa1c2783feb8a7f2e960a3ffde94e31 100644 --- a/src/MNH/modd_sub_modeln.f90 +++ b/src/MNH/modd_sub_modeln.f90 @@ -1,10 +1,11 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------- ! Modifications: ! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O +!- !----------------------------------------------------------------- ! ################# MODULE MODD_SUB_MODEL_n @@ -29,11 +30,11 @@ TYPE SUB_MODEL_t TYPE(HALO2LIST_ll), POINTER :: TZHALO2T_ll TYPE(HALO2LIST_ll), POINTER :: TZHALO2MT_ll TYPE(HALO2LIST_ll), POINTER :: TZHALO2SC_ll - INTEGER :: IBAK, IOUT ! number of the backup / output + INTEGER :: IBAK, IOUT ! number of the backup / output REAL*8,DIMENSION(2) :: XT_START REAL*8,DIMENSION(2) :: XT_STORE,XT_BOUND,XT_GUESS REAL*8,DIMENSION(2) :: XT_ADV,XT_SOURCES,XT_DRAG - REAL*8,DIMENSION(2) :: XT_ADVUVW,XT_GRAV + REAL*8,DIMENSION(2) :: XT_ADVUVW,XT_GRAV,XT_VISC REAL*8,DIMENSION(2) :: XT_DIFF,XT_RELAX,XT_PARAM,XT_SPECTRA REAL*8,DIMENSION(2) :: XT_HALO,XT_RAD_BOUND,XT_PRESS REAL*8,DIMENSION(2) :: XT_CLOUD,XT_STEP_SWA,XT_STEP_MISC @@ -64,6 +65,7 @@ REAL*8,DIMENSION(:), POINTER :: XT_ADV=>NULL(),XT_SOURCES=>NULL(),XT_DRAG=>NULL( REAL*8,DIMENSION(:), POINTER :: XT_ADVUVW=>NULL(),XT_GRAV=>NULL() REAL*8,DIMENSION(:), POINTER :: XT_DIFF=>NULL(),XT_RELAX=>NULL(),XT_PARAM=>NULL(),XT_SPECTRA=>NULL() REAL*8,DIMENSION(:), POINTER :: XT_HALO=>NULL(),XT_RAD_BOUND=>NULL(),XT_PRESS=>NULL() +REAL,DIMENSION(:), POINTER :: XT_VISC=>NULL() REAL*8,DIMENSION(:), POINTER :: XT_CLOUD=>NULL(),XT_STEP_SWA=>NULL(),XT_STEP_MISC=>NULL() REAL*8,DIMENSION(:), POINTER :: XT_ELEC=>NULL(),XT_SHADOWS=>NULL() REAL*8,DIMENSION(:), POINTER :: XT_COUPL=>NULL(),XT_1WAY=>NULL(),XT_STEP_BUD=>NULL() @@ -122,6 +124,7 @@ XT_RELAX=>SUB_MODEL_MODEL(KTO)%XT_RELAX XT_PARAM=>SUB_MODEL_MODEL(KTO)%XT_PARAM XT_SPECTRA=>SUB_MODEL_MODEL(KTO)%XT_SPECTRA XT_HALO=>SUB_MODEL_MODEL(KTO)%XT_HALO +XT_VISC=>SUB_MODEL_MODEL(KTO)%XT_VISC XT_RAD_BOUND=>SUB_MODEL_MODEL(KTO)%XT_RAD_BOUND XT_PRESS=>SUB_MODEL_MODEL(KTO)%XT_PRESS XT_CLOUD=>SUB_MODEL_MODEL(KTO)%XT_CLOUD