Skip to content
Snippets Groups Projects
Commit 52d9436b authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 18/02/2021: minor small improvements

parent 986dc7f8
No related branches found
No related tags found
No related merge requests found
...@@ -464,7 +464,7 @@ END IF ...@@ -464,7 +464,7 @@ END IF
ZTSTEP_PPM = PTSTEP / REAL(KSPLIT) ZTSTEP_PPM = PTSTEP / REAL(KSPLIT)
! !
! !
!* 2.4 normalized contravariant components for splitted PPM time-step !* 2.4 normalized contravariant components for split PPM time-step
! !
ZRUCPPM = ZRUCPPM*ZTSTEP_PPM ZRUCPPM = ZRUCPPM*ZTSTEP_PPM
ZRVCPPM = ZRVCPPM*ZTSTEP_PPM ZRVCPPM = ZRVCPPM*ZTSTEP_PPM
......
!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC Copyright 1994-2021 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 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1. !MNH_LIC for details. version 1.
...@@ -194,7 +194,6 @@ TYPE(LIST_ll), POINTER :: TZFIELDS0_ll ! list of fields to exchange ...@@ -194,7 +194,6 @@ TYPE(LIST_ll), POINTER :: TZFIELDS0_ll ! list of fields to exchange
TYPE(LIST_ll), POINTER :: TZFIELDS4_ll ! list of fields to exchange TYPE(LIST_ll), POINTER :: TZFIELDS4_ll ! list of fields to exchange
! !
! !
REAL :: XPRECISION
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !
!* 0. INITIALIZATION !* 0. INITIALIZATION
......
!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC Copyright 1994-2021 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 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1. !MNH_LIC for details. version 1.
...@@ -169,8 +169,6 @@ INTEGER :: IRRI ! Number of solid water variables ...@@ -169,8 +169,6 @@ INTEGER :: IRRI ! Number of solid water variables
REAL :: ZDRYMASST ! Mass of dry air Md REAL :: ZDRYMASST ! Mass of dry air Md
REAL :: ZREFMASS ! Total mass of the ref. atmosphere REAL :: ZREFMASS ! Total mass of the ref. atmosphere
REAL :: ZMASS_O_PHI0 ! Mass / Phi0 REAL :: ZMASS_O_PHI0 ! Mass / Phi0
LOGICAL :: GCLOSE_OUT ! switch for the LFI writing
CHARACTER (LEN= 28) :: YFMFILE ! virtual FM file
INTEGER :: IMI ! model index INTEGER :: IMI ! model index
!JUAN !JUAN
INTEGER :: IIU_B,IJU_B,IKU INTEGER :: IIU_B,IJU_B,IKU
...@@ -266,8 +264,6 @@ ZMASS_O_PHI0 = 1. ! | which is here not needed | ...@@ -266,8 +264,6 @@ ZMASS_O_PHI0 = 1. ! | which is here not needed |
IRR = 0 ! | | IRR = 0 ! | |
IRRL = 0 ! | | IRRL = 0 ! | |
IRRI = 0 ! ============================================== IRRI = 0 ! ==============================================
GCLOSE_OUT=.FALSE.
YFMFILE='UNUSED'
! !
IMI = GET_CURRENT_MODEL_INDEX() IMI = GET_CURRENT_MODEL_INDEX()
CALL PRESSUREZ(CLBCX,CLBCY,CPRESOPT,NITR,LITRADJ,ITCOUNT,XRELAX,IMI, & CALL PRESSUREZ(CLBCX,CLBCY,CPRESOPT,NITR,LITRADJ,ITCOUNT,XRELAX,IMI, &
......
!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC Copyright 1994-2021 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 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1. !MNH_LIC for details. version 1.
...@@ -58,8 +58,10 @@ subroutine Budget_store_init( tpbudget, hsource, pvars ) ...@@ -58,8 +58,10 @@ subroutine Budget_store_init( tpbudget, hsource, pvars )
call Budget_source_id_find( tpbudget, hsource, iid ) call Budget_source_id_find( tpbudget, hsource, iid )
if ( tpbudget%ntmpstoresource /= 0 ) then if ( tpbudget%ntmpstoresource /= 0 ) then
call Print_msg( NVERB_ERROR, 'BUD', 'Budget_store_init', 'ntmpstoresource already set (previous call to ' & cmnhmsg(1) = 'ntmpstoresource already set (previous call to '//'Budget_store_end missing?)'
//'Budget_store_end missing?) for '//trim( tpbudget%cname )//':'//trim( hsource ) ) cmnhmsg(2) = 'Set for: ' // Trim( tpbudget%cname ) // ':' // Trim( tpbudget%tsources(tpbudget%ntmpstoresource)%cmnhname )
cmnhmsg(3) = 'Working on: ' // Trim( tpbudget%cname ) // ':' // Trim( hsource )
call Print_msg( NVERB_ERROR, 'BUD', 'Budget_store_init' )
end if end if
if ( tpbudget%tsources(iid)%ldonotinit ) then if ( tpbudget%tsources(iid)%ldonotinit ) then
......
!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC Copyright 1994-2021 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 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1. !MNH_LIC for details. version 1.
...@@ -148,8 +148,6 @@ INTEGER:: IW,IE,IS,IN ! Coordinate of forth order diffusion area ...@@ -148,8 +148,6 @@ INTEGER:: IW,IE,IS,IN ! Coordinate of forth order diffusion area
TYPE(LIST_ll), POINTER :: TZFIELD_U, TZFIELD_V, TZFIELD_DZX, TZFIELD_DZY TYPE(LIST_ll), POINTER :: TZFIELD_U, TZFIELD_V, TZFIELD_DZX, TZFIELD_DZY
TYPE(HALO2LIST_ll), POINTER :: TZHALO2_U, TZHALO2_V, TZHALO2_DZX, TZHALO2_DZY TYPE(HALO2LIST_ll), POINTER :: TZHALO2_U, TZHALO2_V, TZHALO2_DZX, TZHALO2_DZY
INTEGER :: IINFO_ll INTEGER :: IINFO_ll
!JUAN
REAL :: XPRECISION
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
! !
!* 1. Compute the horizontal contravariant components !* 1. Compute the horizontal contravariant components
......
!MNH_LIC Copyright 2010-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC Copyright 2010-2021 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 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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1. !MNH_LIC for details. version 1.
...@@ -12,7 +12,7 @@ INTERFACE ...@@ -12,7 +12,7 @@ INTERFACE
SUBROUTINE ION_DRIFT(PDRIFTP, PDRIFTM, PSVT, HLBCX, HLBCY) SUBROUTINE ION_DRIFT(PDRIFTP, PDRIFTM, PSVT, HLBCX, HLBCY)
! !
CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDRIFTP, PDRIFTM REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDRIFTP, PDRIFTM
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PSVT REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PSVT
! !
END SUBROUTINE ION_DRIFT END SUBROUTINE ION_DRIFT
...@@ -65,7 +65,7 @@ IMPLICIT NONE ...@@ -65,7 +65,7 @@ IMPLICIT NONE
!* 0.1 declarations of arguments !* 0.1 declarations of arguments
! !
CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY CHARACTER(LEN=4), DIMENSION(2), INTENT(IN) :: HLBCX,HLBCY
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDRIFTP, PDRIFTM REAL, DIMENSION(:,:,:), INTENT(OUT) :: PDRIFTP, PDRIFTM
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PSVT REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PSVT
! !
! !
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment