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

Philippe 01/02/2023: fixes for MNH_REAL=4

parent ac0929b2
No related branches found
No related tags found
No related merge requests found
!ORILAM_LIC Copyright 2007-2019 CNRS, Meteo-France and Universite Paul Sabatier !ORILAM_LIC Copyright 2007-2023 CNRS, Meteo-France and Universite Paul Sabatier
!ORILAM_LIC This is part of the ORILAM software governed by the CeCILL-C licence !ORILAM_LIC This is part of the ORILAM software governed by the CeCILL-C licence
!ORILAM_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !ORILAM_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!ORILAM_LIC for details. !ORILAM_LIC for details.
...@@ -787,6 +787,8 @@ END SUBROUTINE AER_WET_DEP_KMT_WARM_SEDIMENT ...@@ -787,6 +787,8 @@ END SUBROUTINE AER_WET_DEP_KMT_WARM_SEDIMENT
! !
!* 0. DECLARATIONS !* 0. DECLARATIONS
! !
USE MODD_CST, ONLY: XMNH_HUGE
IMPLICIT NONE IMPLICIT NONE
! !
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
...@@ -801,7 +803,7 @@ ZZRCT(:,:,:) = MAX(ZZRCT(:,:,:), KRTMIN(2)/2.) ...@@ -801,7 +803,7 @@ ZZRCT(:,:,:) = MAX(ZZRCT(:,:,:), KRTMIN(2)/2.)
IF (PRESENT(PCRT)) THEN ! 2-moment schemes IF (PRESENT(PCRT)) THEN ! 2-moment schemes
! !
! from lima_warm_coal.f90 (AUTO) ! from lima_warm_coal.f90 (AUTO)
ZLBDC3(:,:,:) = 1.E45 ZLBDC3(:,:,:) = XMNH_HUGE
ZLBDC(:,:,:) = 1.E15 ZLBDC(:,:,:) = 1.E15
WHERE (ZZRCT(:,:,:) > KRTMIN(2) .AND. PCCT(:,:,:) > XCTMIN(2)) WHERE (ZZRCT(:,:,:) > KRTMIN(2) .AND. PCCT(:,:,:) > XCTMIN(2))
ZLBDC3(:,:,:) = KLBC * PCCT(:,:,:) / PRCT(:,:,:) ZLBDC3(:,:,:) = KLBC * PCCT(:,:,:) / PRCT(:,:,:)
......
...@@ -2170,6 +2170,7 @@ SUBROUTINE FIRE_RK( PLSPHI, PLSPHI1, PGRADLSPHIX, PGRADLSPHIY, PFIRERW, PFIREDT ...@@ -2170,6 +2170,7 @@ SUBROUTINE FIRE_RK( PLSPHI, PLSPHI1, PGRADLSPHIX, PGRADLSPHIY, PFIRERW, PFIREDT
USE MODD_PARAMETERS, ONLY : JPVEXT USE MODD_PARAMETERS, ONLY : JPVEXT
USE MODD_CONF, ONLY : NHALO USE MODD_CONF, ONLY : NHALO
USE MODD_LUNIT_n, ONLY: TLUOUT USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PRECISION, ONLY: MNHTIME
! !
USE MODI_GET_HALO USE MODI_GET_HALO
USE MODE_MPPDB USE MODE_MPPDB
...@@ -2221,7 +2222,7 @@ SUBROUTINE FIRE_RK( PLSPHI, PLSPHI1, PGRADLSPHIX, PGRADLSPHIY, PFIRERW, PFIREDT ...@@ -2221,7 +2222,7 @@ SUBROUTINE FIRE_RK( PLSPHI, PLSPHI1, PGRADLSPHIX, PGRADLSPHIY, PFIRERW, PFIREDT
TYPE(LIST_ll), POINTER :: TZFIELDS4_ll ! list of fields to exchange TYPE(LIST_ll), POINTER :: TZFIELDS4_ll ! list of fields to exchange
! !
REAL :: XPRECISION REAL :: XPRECISION
REAL, DIMENSION(2) :: ZGRADTIME1, ZGRADTIME2 REAL(KIND=MNHTIME), DIMENSION(2) :: ZGRADTIME1, ZGRADTIME2
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !
!* 0. INITIALIZATION !* 0. INITIALIZATION
......
...@@ -179,6 +179,7 @@ USE MODD_CSTS_SALT, ONLY : XMOLARWEIGHT_SALT ...@@ -179,6 +179,7 @@ USE MODD_CSTS_SALT, ONLY : XMOLARWEIGHT_SALT
USE MODD_CH_FLX_n, ONLY : XCHFLX USE MODD_CH_FLX_n, ONLY : XCHFLX
USE MODD_DIAG_FLAG, ONLY : LCHEMDIAG USE MODD_DIAG_FLAG, ONLY : LCHEMDIAG
USE MODD_SURF_PAR, ONLY: XUNDEF_SFX => XUNDEF USE MODD_SURF_PAR, ONLY: XUNDEF_SFX => XUNDEF
USE MODD_PRECISION, ONLY: MNHTIME
! !
USE MODI_NORMAL_INTERPOL USE MODI_NORMAL_INTERPOL
USE MODE_ROTATE_WIND, ONLY: ROTATE_WIND USE MODE_ROTATE_WIND, ONLY: ROTATE_WIND
...@@ -386,11 +387,11 @@ REAL :: ZTIMEC ...@@ -386,11 +387,11 @@ REAL :: ZTIMEC
INTEGER :: ILUOUT ! logical unit INTEGER :: ILUOUT ! logical unit
! !
! Fire model ! Fire model
REAL, DIMENSION(2) :: ZFIRETIME1, ZFIRETIME2 ! CPU time for Blaze perf profiling REAL(KIND=MNHTIME), DIMENSION(2) :: ZFIRETIME1, ZFIRETIME2 ! CPU time for Blaze perf profiling
REAL, DIMENSION(2) :: ZGRADTIME1, ZGRADTIME2 ! CPU time for Blaze perf profiling REAL(KIND=MNHTIME), DIMENSION(2) :: ZGRADTIME1, ZGRADTIME2 ! CPU time for Blaze perf profiling
REAL, DIMENSION(2) :: ZPROPAGTIME1, ZPROPAGTIME2 ! CPU time for Blaze perf profiling REAL(KIND=MNHTIME), DIMENSION(2) :: ZPROPAGTIME1, ZPROPAGTIME2 ! CPU time for Blaze perf profiling
REAL, DIMENSION(2) :: ZFLUXTIME1, ZFLUXTIME2 ! CPU time for Blaze perf profiling REAL(KIND=MNHTIME), DIMENSION(2) :: ZFLUXTIME1, ZFLUXTIME2 ! CPU time for Blaze perf profiling
REAL, DIMENSION(2) :: ZROSWINDTIME1, ZROSWINDTIME2 ! CPU time for Blaze perf profiling REAL(KIND=MNHTIME), DIMENSION(2) :: ZROSWINDTIME1, ZROSWINDTIME2 ! CPU time for Blaze perf profiling
REAL, DIMENSION(:,:,:,:), ALLOCATABLE :: ZFIREFUELMAP ! Fuel map REAL, DIMENSION(:,:,:,:), ALLOCATABLE :: ZFIREFUELMAP ! Fuel map
CHARACTER(LEN=7) :: YFUELMAPFILE ! Fuel Map file name CHARACTER(LEN=7) :: YFUELMAPFILE ! Fuel Map file name
TYPE(LIST_ll), POINTER :: TZFIELDFIRE_ll ! list of fields to exchange TYPE(LIST_ll), POINTER :: TZFIELDFIRE_ll ! list of fields to exchange
......
!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC Copyright 2019-2023 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.
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
!! !!
!!** IMPLICIT ARGUMENTS !!** IMPLICIT ARGUMENTS
!! ------------------ !! ------------------
!! Module MODD_PARAMETERS : contains the maximum number of coupling files
!! !!
!! REFERENCE !! REFERENCE
!! --------- !! ---------
...@@ -33,7 +32,7 @@ ...@@ -33,7 +32,7 @@
!* 0. DECLARATIONS !* 0. DECLARATIONS
! ------------ ! ------------
! !
USE MODD_PARAMETERS USE MODD_PRECISION, ONLY: MNHTIME
! !
IMPLICIT NONE IMPLICIT NONE
! !
...@@ -78,12 +77,12 @@ INTEGER , SAVE :: NNBSMOKETRACER ...@@ -78,12 +77,12 @@ INTEGER , SAVE :: NNBSMOKETRACER
! !
! Parameters not in the namelist ! Parameters not in the namelist
! !
REAL , SAVE :: XFIREMESHSIZE(2) ! Fire Mesh size [dxf,dyf] REAL, DIMENSION(2), SAVE :: XFIREMESHSIZE ! Fire Mesh size [dxf,dyf]
REAL , SAVE :: XFIREPERF(2) ! Blaze fire model performance REAL(KIND=MNHTIME), DIMENSION(2), SAVE :: XFIREPERF ! Blaze fire model performance
REAL , SAVE :: XGRADPERF(2) ! Grad computation performance REAL(KIND=MNHTIME), DIMENSION(2), SAVE :: XGRADPERF ! Grad computation performance
REAL , SAVE :: XROSWINDPERF(2) ! ROS and wind interpolation computation performance REAL(KIND=MNHTIME), DIMENSION(2), SAVE :: XROSWINDPERF ! ROS and wind interpolation computation performance
REAL , SAVE :: XPROPAGPERF(2) ! Propagation computation performance REAL(KIND=MNHTIME), DIMENSION(2), SAVE :: XPROPAGPERF ! Propagation computation performance
REAL , SAVE :: XFLUXPERF(2) ! Heat fluxes computation performance REAL(KIND=MNHTIME), DIMENSION(2), SAVE :: XFLUXPERF ! Heat fluxes computation performance
LOGICAL , SAVE :: LRESTA_ASE ! Flag for using ASE in RESTA file LOGICAL , SAVE :: LRESTA_ASE ! Flag for using ASE in RESTA file
LOGICAL , SAVE :: LRESTA_AWC ! Flag for using AWC in RESTA file LOGICAL , SAVE :: LRESTA_AWC ! Flag for using AWC in RESTA file
LOGICAL , SAVE :: LRESTA_EWAM ! Flag for using EWAM in RESTA file LOGICAL , SAVE :: LRESTA_EWAM ! Flag for using EWAM in RESTA file
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment