From 692b21ed11fee865ac641c557fb544a6cc4e3c51 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 10 Feb 2023 14:08:45 +0100
Subject: [PATCH] Philippe 10/02/2023: rename blaze namelist and modules for
grid-nesting (not yet supported for blaze)
---
src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 | 7 +--
src/LIB/SURCOUCHE/src/mode_field.f90 | 4 +-
src/MNH/deallocate_model1.f90 | 4 +-
src/MNH/default_desfmn.f90 | 6 +--
src/MNH/firemodel.f90 | 52 +++++++++++-----------
src/MNH/goto_model_wrapper.f90 | 2 +-
src/MNH/ground_paramn.f90 | 6 +--
src/MNH/ini_budget.f90 | 4 +-
src/MNH/ini_modeln.f90 | 2 +-
src/MNH/ini_nsv.f90 | 2 +-
src/MNH/ini_segn.f90 | 8 ++--
src/MNH/modd_firen.f90 | 6 +--
src/MNH/modeln.f90 | 2 +-
src/MNH/modn_firen.f90 | 25 ++++++-----
src/MNH/read_desfmn.f90 | 10 ++---
src/MNH/read_exsegn.f90 | 10 ++---
src/MNH/read_field.f90 | 2 +-
src/MNH/write_desfmn.f90 | 8 ++--
src/MNH/write_lfin.f90 | 2 +-
19 files changed, 83 insertions(+), 79 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
index b6f9b7aff..b45850ab0 100644
--- a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1998-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1998-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -1928,7 +1928,8 @@ INTEGER :: NB_REQ
USE MODD_CONFZ, ONLY : LMNH_MPI_BSEND
!JUANZ
! Blaze
-USE MODD_FIRE, ONLY : LBLAZE,NREFINX,NREFINY
+ USE MODD_FIRE_n, ONLY : LBLAZE, NREFINX, NREFINY
+
IMPLICIT NONE
!
!* 0.1 declarations of arguments
@@ -2324,7 +2325,7 @@ INTEGER :: NB_REQ,NFIRST_REQ_RECV
USE MODD_CONFZ, ONLY : LMNH_MPI_BSEND
!JUANZ
!Blaze
-USE MODD_FIRE, ONLY : LBLAZE,NREFINX,NREFINY
+ USE MODD_FIRE_n, ONLY: LBLAZE, NREFINX, NREFINY
!
!-------------------------------------------------------------------------------
!
diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index 55aa86add..ddfa90bf9 100644
--- a/src/LIB/SURCOUCHE/src/mode_field.f90
+++ b/src/LIB/SURCOUCHE/src/mode_field.f90
@@ -25,7 +25,7 @@ use modd_conf, only: cprogram
use modd_field
use modd_io, only: NVERB_DEBUG, NVERB_INFO, NVERB_WARNING, NVERB_ERROR, NVERB_FATAL
use modd_parameters, only: JPMODELMAX
-use modd_fire, only: NREFINX, NREFINY
+use modd_fire_n, only: NREFINX, NREFINY
use mode_msg
@@ -3667,7 +3667,7 @@ USE MODD_DEF_EDDYUV_FLUX_n
USE MODD_DYN_n
USE MODD_ELEC_n
USE MODD_FIELD_n
-USE MODD_FIRE
+USE MODD_FIRE_n
USE MODD_GR_FIELD_n
USE MODD_GRID_n
USE MODD_HURR_FIELD_n
diff --git a/src/MNH/deallocate_model1.f90 b/src/MNH/deallocate_model1.f90
index 89c9c3170..99cc7f778 100644
--- a/src/MNH/deallocate_model1.f90
+++ b/src/MNH/deallocate_model1.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1997-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -78,7 +78,7 @@ USE MODD_REF
!
USE MODD_METRICS_n
USE MODD_FIELD_n
-USE MODD_FIRE
+USE MODD_FIRE_n
USE MODD_DUMMY_GR_FIELD_n
USE MODD_LSFIELD_n
USE MODD_GRID_n
diff --git a/src/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90
index 829ce58fc..4fbb2bc81 100644
--- a/src/MNH/default_desfmn.f90
+++ b/src/MNH/default_desfmn.f90
@@ -311,7 +311,7 @@ USE MODD_IBM_LSF
#ifdef MNH_FOREFIRE
USE MODD_FOREFIRE
#endif
-USE MODD_FIRE
+USE MODD_FIRE_n
!
IMPLICIT NONE
!
@@ -1440,8 +1440,8 @@ ENDIF
!
!-------------------------------------------------------------------------------
!
-!* 33. SET DEFAULT VALUES FOR MODD_FIRE
-! --------------------------------
+!* 33. SET DEFAULT VALUES FOR MODD_FIRE_n
+! ----------------------------------
!
! Blaze fire model namelist
!
diff --git a/src/MNH/firemodel.f90 b/src/MNH/firemodel.f90
index fa640ec54..a53e56a0b 100644
--- a/src/MNH/firemodel.f90
+++ b/src/MNH/firemodel.f90
@@ -475,7 +475,7 @@ SUBROUTINE FIRE_GRADPHI( PLSPHI, PGRADLSPHIX, PGRADLSPHIY )
USE MODD_PARAMETERS
USE MODD_CST
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODI_FIRE_MODEL, ONLY: FIRE_GRADMASK, FIRE_WENO_1, FIRE_WENO_3
!
USE MODE_MPPDB
@@ -628,7 +628,7 @@ SUBROUTINE FIRE_PROPAGATE( PLSPHI, PBMAP, PFMIGNITION, PFMWALKIG, PGRADLSPHIX, P
USE MODD_PARAMETERS
USE MODD_CST
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_TIME_n, ONLY : TDTCUR
USE MODI_FIRE_MODEL, ONLY: FIRE_RK, FIRE_LS_RECONSTRUCTION_FROM_BMAP
USE MODD_LUNIT_n, ONLY: TLUOUT
@@ -781,7 +781,7 @@ SUBROUTINE FIRE_NOWINDROS( PFIREFUELMAP, PFMR0, PFMRFA, PFMWF0, PFMR00, PFMFUELT
USE MODD_CST, ONLY : XSTEFAN
USE MODD_CONF, ONLY: CCONF
USE MODE_MPPDB
- USE MODD_FIRE
+ USE MODD_FIRE_n
IMPLICIT NONE
@@ -1093,7 +1093,7 @@ SUBROUTINE FIRE_GETWIND( PUT, PVT, PWT, PGRADLSPHIX, PGRADLSPHIY, PFIREWIND, KTC
!! ============
!
USE MODD_CONF, ONLY: CCONF
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_GRID_n, ONLY: XXHAT,XYHAT
!
USE MODI_SHUMAN, ONLY: MXF, MYF
@@ -1354,7 +1354,7 @@ SUBROUTINE FIRE_RATEOFSPREAD( PFMFUELTYPE, PFMR0, PFMRFA, PFMWF0, PFMR00, PFIREW
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODI_FIRE_MODEL, ONLY: FIRE_ROSDIFFU
USE MODE_MPPDB
USE MODD_TIME_n, ONLY : TDTCUR
@@ -1514,7 +1514,7 @@ SUBROUTINE FIRE_HEATFLUXES( PLSPHI, PBMAP, PFIRETAU, PATMDT, PFLUXPARAMH, PFLUXP
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_TIME_n, ONLY : TDTCUR
USE MODI_FIRE_MODEL, ONLY: FIRE_SUBGRIDSURFACE
!
@@ -1778,7 +1778,7 @@ SUBROUTINE FIRE_VERTICALFLUXDISTRIB( PFMFLUXHDH, PFMFLUXHDW, PRTHS, PRRS, PSFTS,
!! ============
!
USE MODD_CST
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_TIME_n, ONLY : TDTCUR
!USE MODI_FIRE_MODEL
USE MODD_GRID_n, ONLY : XZS, XZZ
@@ -1955,7 +1955,7 @@ SUBROUTINE FIRE_READFUEL( TPFILE, PFIREFUELMAP, PFMIGNITION, PFMWALKIG )
!! ============
!
USE MODD_FIELD, ONLY: NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_NOTLISTED, TFIELDMETADATA, TYPEREAL
- USE MODD_FIRE, ONLY: NFIREENTRIES
+ USE MODD_FIRE_n, ONLY: NFIREENTRIES
USE MODD_IO, ONLY: TFILEDATA
USE MODE_IO_FIELD_READ, ONLY: IO_Field_read
USE MODE_IO_FILE, ONLY: IO_File_close, IO_File_open
@@ -2117,7 +2117,7 @@ SUBROUTINE FIRE_READBMAP(TPFILE, PBMAP)
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE, ONLY: CBMAPFILE
+ USE MODD_FIRE_n, ONLY: CBMAPFILE
USE MODD_IO, ONLY: TFILEDATA
USE MODE_IO_FIELD_READ, ONLY: IO_Field_read
USE MODE_IO_FILE, ONLY: IO_File_close, IO_File_open
@@ -2208,7 +2208,7 @@ SUBROUTINE FIRE_RK( PLSPHI, PLSPHI1, PGRADLSPHIX, PGRADLSPHIY, PFIRERW, PFIREDT
USE MODI_GET_HALO
USE MODE_MPPDB
USE MODE_MSG
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODI_FIRE_MODEL, ONLY: FIRE_GRADPHI, FIRE_LSDIFFU
use MODE_MNH_TIMING, ONLY : SECOND_MNH2
!
@@ -2472,7 +2472,7 @@ SUBROUTINE FIRE_WENO_1( PLSPHI2D, PGRADLSPHIX2D, PGRADLSPHIY2D, PGRADMASKX, PGRA
USE MODD_PARAMETERS
USE MODD_CST
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_TIME_n, ONLY : TDTCUR
!USE MODI_FIRE_MODEL
!
@@ -2559,7 +2559,7 @@ SUBROUTINE FIRE_GRADMASK( PLSPHI2D, PGRADMASKX, PGRADMASKY, KMASKORDER )
!
USE MODD_PARAMETERS
USE MODD_CST
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_TIME_n, ONLY : TDTCUR
!USE MODI_FIRE_MODEL
!
@@ -2664,7 +2664,7 @@ SUBROUTINE FIRE_WENO_3( PLSPHI2D, PGRADLSPHIX2D, PGRADLSPHIY2D, PGRADMASKX, PGRA
USE MODD_PARAMETERS
USE MODD_CST
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_TIME_n, ONLY : TDTCUR
!USE MODI_FIRE_MODEL
!
@@ -2974,7 +2974,7 @@ SUBROUTINE FIRE_LSDIFFU( PLSPHI, PLSDIFFUX, PLSDIFFUY )
USE MODD_PARAMETERS
USE MODD_CST
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
!USE MODI_FIRE_MODEL
!
USE MODE_MPPDB
@@ -3113,7 +3113,7 @@ SUBROUTINE FIRE_ROSDIFFU( PFIRERW )
USE MODD_PARAMETERS
USE MODD_CST
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
!USE MODI_FIRE_MODEL
!
USE MODE_MPPDB
@@ -3254,7 +3254,7 @@ SUBROUTINE FIRE_SUBGRIDSURFACE( PLSPHI2D, PSURFRATIO2D )
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_TIME_n, ONLY : TDTCUR
USE MODI_FIRE_MODEL, ONLY: FIRE_QUANDRANTSURFACE
!
@@ -3382,7 +3382,7 @@ SUBROUTINE FIRE_QUANDRANTSURFACE( PPHI1, PPHI2, PPHI3, PPHI4, PSURFRATIO2D )
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_TIME_n, ONLY : TDTCUR
USE MODI_FIRE_MODEL, ONLY: FIRE_SURF_68,FIRE_SURF_70,FIRE_SURF_22,FIRE_SURF_28
!
@@ -3560,7 +3560,7 @@ FUNCTION FIRE_SURF_68( PPHI1, PPHI2, PPHI3, PPHI4 ) RESULT( PSURF )
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODE_MPPDB
!
IMPLICIT NONE
@@ -3600,7 +3600,7 @@ FUNCTION FIRE_SURF_70( PPHI1, PPHI2, PPHI3, PPHI4 ) RESULT( PSURF )
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODE_MPPDB
!
IMPLICIT NONE
@@ -3643,7 +3643,7 @@ FUNCTION FIRE_SURF_22( PPHI1, PPHI2, PPHI3, PPHI4 ) RESULT( PSURF )
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODE_MPPDB
IMPLICIT NONE
@@ -3686,7 +3686,7 @@ FUNCTION FIRE_SURF_28( PPHI1, PPHI2, PPHI3, PPHI4 ) RESULT( PSURF )
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
!
USE MODE_MPPDB
!
@@ -3745,7 +3745,7 @@ SUBROUTINE FIRE_LS_RECONSTRUCTION_FROM_BMAP( PLSPHI, PBMAP, PATMDT )
!
!* 0. DECLARATIONS
!
- USE MODD_FIRE
+ USE MODD_FIRE_n
USE MODD_TIME_n, ONLY : TDTCUR
!USE MODI_FIRE_MODEL
!
@@ -3826,7 +3826,7 @@ SUBROUTINE FIRE_GRAD_OROGRAPHY( PZS, PFMGRADOROX, PFMGRADOROY )
!
!* 0. DECLARATIONS
!
- USE MODD_FIRE, ONLY: XFIREMESHSIZE, NREFINX, NREFINY
+ USE MODD_FIRE_n, ONLY: XFIREMESHSIZE, NREFINX, NREFINY
!
USE MODE_MPPDB
!
@@ -4079,7 +4079,7 @@ FUNCTION FGET_I(PLINDEX,PMINDEX) RESULT(POUTINDEX)
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE, ONLY : NREFINX,NREFINY
+ USE MODD_FIRE_n, ONLY : NREFINX,NREFINY
USE MODE_MPPDB
!
IMPLICIT NONE
@@ -4125,7 +4125,7 @@ FUNCTION FGET_J(PLINDEX,PMINDEX) RESULT(POUTINDEX)
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE, ONLY : NREFINX,NREFINY
+ USE MODD_FIRE_n, ONLY : NREFINX,NREFINY
USE MODE_MPPDB
!
IMPLICIT NONE
@@ -4170,7 +4170,7 @@ FUNCTION FGET_K(PLINDEX,PMINDEX) RESULT(POUTINDEX)
!* 0. DECLARATIONS
!! ============
!
- USE MODD_FIRE, ONLY : NREFINX,NREFINY
+ USE MODD_FIRE_n, ONLY : NREFINX,NREFINY
USE MODE_MPPDB
!
IMPLICIT NONE
diff --git a/src/MNH/goto_model_wrapper.f90 b/src/MNH/goto_model_wrapper.f90
index 5c99862b0..d3b6e9521 100644
--- a/src/MNH/goto_model_wrapper.f90
+++ b/src/MNH/goto_model_wrapper.f90
@@ -65,7 +65,7 @@ USE MODD_DYN_n
USE MODD_DYNZD_n
USE MODD_ELEC_n
USE MODD_FIELD_n
-USE MODD_FIRE
+USE MODD_FIRE_n
#ifdef MNH_FOREFIRE
USE MODD_FOREFIRE_n
#endif
diff --git a/src/MNH/ground_paramn.f90 b/src/MNH/ground_paramn.f90
index c60225b13..3f5112ca1 100644
--- a/src/MNH/ground_paramn.f90
+++ b/src/MNH/ground_paramn.f90
@@ -146,8 +146,8 @@ USE MODD_PARAMETERS, ONLY : JPVEXT
USE MODD_DYN_n, ONLY : XTSTEP
USE MODD_CH_MNHC_n, ONLY : LUSECHEM
USE MODD_FIELD_n, ONLY : XUT, XVT, XWT, XTHT, XRT, XPABST, XSVT, XTKET, XZWS, XRTHS, XRRS
-USE MODD_FIRE, ONLY : XLSPHI, XBMAP, XFMR0, XFMRFA, XFMWF0, XFMR00, XFMIGNITION, XFMFUELTYPE, &
- XFIRETAU, XFLUXPARAMH, XFLUXPARAMW, XFIRERW, XFMASE, XFMAWC, XFMWALKIG, &
+USE MODD_FIRE_n, ONLY : XLSPHI, XBMAP, XFMR0, XFMRFA, XFMWF0, XFMR00, XFMIGNITION, XFMFUELTYPE, &
+ XFIRETAU, XFLUXPARAMH, XFLUXPARAMW, XFIRERW, XFMASE, XFMAWC, XFMWALKIG, &
XFMFLUXHDH, XFMFLUXHDW, XFMHWS, XFMWINDU, XFMWINDV, XFMWINDW, XGRADLSPHIX, &
XGRADLSPHIY, XFIREWIND, XFMGRADOROX, XFMGRADOROY
USE MODD_METRICS_n, ONLY : XDXX, XDYY, XDZZ
@@ -204,7 +204,7 @@ USE MODD_TIME
!
USE MODD_PARAM_LIMA, ONLY : MSEDC=>LSEDC
!
-USE MODD_FIRE
+USE MODD_FIRE_n
USE MODD_FIELD
USE MODI_FIRE_MODEL
USE MODD_CONF, ONLY : NVERB, NHALO
diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90
index 5a5bdb22d..4995f8fe0 100644
--- a/src/MNH/ini_budget.f90
+++ b/src/MNH/ini_budget.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2022 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -228,7 +228,7 @@ use modd_dyn, only: lcorio, xseglen
use modd_dyn_n, only: xtstep, locean
use modd_elec_descr, only: linductive, lrelax2fw_ion
use modd_field, only: TYPEREAL
-use modd_fire, only: lblaze
+use modd_fire_n, only: lblaze
use modd_nsv, only: nsv_aerbeg, nsv_aerend, nsv_aerdepbeg, nsv_aerdepend, nsv_c2r2beg, nsv_c2r2end, &
nsv_chembeg, nsv_chemend, nsv_chicbeg, nsv_chicend, nsv_csbeg, nsv_csend, &
nsv_dstbeg, nsv_dstend, nsv_dstdepbeg, nsv_dstdepend, nsv_elecbeg, nsv_elecend, &
diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index 779b55526..c8511bd6f 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -478,7 +478,7 @@ USE YOERDI , ONLY :RCCO2
#endif
#endif
!
-USE MODD_FIRE
+USE MODD_FIRE_n
IMPLICIT NONE
!
!* 0.1 declarations of arguments
diff --git a/src/MNH/ini_nsv.f90 b/src/MNH/ini_nsv.f90
index d8ff36f6b..3565b2bfb 100644
--- a/src/MNH/ini_nsv.f90
+++ b/src/MNH/ini_nsv.f90
@@ -102,7 +102,7 @@ USE MODD_DYN_n, ONLY: LHORELAX_SVFF
USE MODD_ELEC_DESCR, ONLY: LLNOX_EXPLICIT
USE MODD_ELEC_DESCR, ONLY: CELECNAMES
USE MODD_FIELD, ONLY: TFIELDMETADATA, TYPEREAL
-USE MODD_FIRE
+USE MODD_FIRE_n
#ifdef MNH_FOREFIRE
USE MODD_FOREFIRE
#endif
diff --git a/src/MNH/ini_segn.f90 b/src/MNH/ini_segn.f90
index 629da3473..a5a3b07aa 100644
--- a/src/MNH/ini_segn.f90
+++ b/src/MNH/ini_segn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -198,7 +198,7 @@ USE MODI_WRITE_DESFM_n
!
USE MODN_CONFIO, ONLY: NAM_CONFIO
USE MODN_LUNIT_n
-USE MODN_FIRE
+USE MODN_FIRE_n
!
IMPLICIT NONE
!
@@ -344,8 +344,8 @@ IF (CPROGRAM=='MESONH') THEN
IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_CONFIO)
CALL IO_Config_set()
! read Blaze namelist to get NREFINX and NREFINY before INI_FIELD_LIST
- CALL POSNAM(ILUSEG,'NAM_FIRE',GFOUND,ILUOUT)
- IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_FIRE)
+ CALL POSNAM(ILUSEG,'NAM_FIREn',GFOUND,ILUOUT)
+ IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_FIREn)
END IF
HINIFILEPGD=CINIFILEPGD_n
YINIFILE=CINIFILE_n
diff --git a/src/MNH/modd_firen.f90 b/src/MNH/modd_firen.f90
index 329d6f011..c1716c616 100644
--- a/src/MNH/modd_firen.f90
+++ b/src/MNH/modd_firen.f90
@@ -4,10 +4,10 @@
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
! ################
- MODULE MODD_FIRE
+ MODULE MODD_FIRE_n
! ################
!
-!!**** *MODD_FIRE* - declaration of Fire model parameters
+!!**** *MODD_FIRE_n* - declaration of Fire model parameters
!!
!! PURPOSE
!! -------
@@ -187,4 +187,4 @@ SUBROUTINE FIRE_GOTO_MODEL(KFROM, KTO)
XFIRERW2D => TFIRE_MODEL(KTO)%XFIRERW2D
END SUBROUTINE FIRE_GOTO_MODEL
-END MODULE MODD_FIRE
+END MODULE MODD_FIRE_n
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index 3ee78c99f..6d0bdaf18 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -464,7 +464,7 @@ USE MODI_WRITE_LFIFM_n
USE MODI_WRITE_SERIES_n
USE MODI_WRITE_SURF_ATM_N
!
-USE MODD_FIRE
+USE MODD_FIRE_n
IMPLICIT NONE
!
!* 0.1 declarations of arguments
diff --git a/src/MNH/modn_firen.f90 b/src/MNH/modn_firen.f90
index 631936cd6..8af1b5993 100644
--- a/src/MNH/modn_firen.f90
+++ b/src/MNH/modn_firen.f90
@@ -1,28 +1,28 @@
-!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2018-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
!-----------------------------------------------------------------
-! #################
- MODULE MODN_FIRE
-! #################
+! ##################
+ MODULE MODN_FIRE_n
+! ##################
!
-!!**** *MODN_FIRE* - declaration of namelist NAM_FIRE
+!!**** *MODN_FIRE_n* - declaration of namelist NAM_FIREn
!!
!! PURPOSE
!! -------
-! The purpose of this module is to specify the namelist NAM_FIRE
+! The purpose of this module is to specify the namelist NAM_FIREn
! which concerns the instants for the outputs realized by all models.
!
!!** IMPLICIT ARGUMENTS
!! ------------------
-!! Module MODD_FIRE : contains declaration of the variables describing
+!! Module MODD_FIRE_n : contains declaration of the variables describing
!! the instants for the outputs
!!
!!
!! REFERENCE
!! ---------
-!! Book2 of Meso-NH documentation (module MODD_FIRE)
+!! Book2 of Meso-NH documentation (module MODD_FIRE_n)
!!
!! AUTHOR
!! ------
@@ -36,11 +36,14 @@
!* 0. DECLARATIONS
! ------------
!
-USE MODD_FIRE
+USE MODD_FIRE_n
!
IMPLICIT NONE
!
-NAMELIST/NAM_FIRE/LBLAZE,&
+
+!PW: gerer le grid nesting (cft modn_stationn?)
+
+NAMELIST/NAM_FIREn/LBLAZE,&
CPROPAG_MODEL,CHEAT_FLUX_MODEL,CLATENT_FLUX_MODEL,XFERR,&
NFIRE_RK_ORDER,NFIRE_WENO_ORDER,LSGBAWEIGHT,&
NREFINX,NREFINY,XCFLMAXFIRE,CFIRE_CPL_MODE,CBMAPFILE,&
@@ -48,4 +51,4 @@ LINTERPWIND,XLSDIFFUSION,XROSDIFFUSION,NNBSMOKETRACER,&
XFLUXZEXT,XFLUXZMAX,XFLXCOEFTMP,&
LWINDFILTER,CWINDFILTER,XEWAMTAU,XWLIMUTH,XWLIMUTMAX,NWINDSLOPECPLMODE
!
-END MODULE MODN_FIRE
+END MODULE MODN_FIRE_n
diff --git a/src/MNH/read_desfmn.f90 b/src/MNH/read_desfmn.f90
index 8a69a7f9c..be813a80a 100644
--- a/src/MNH/read_desfmn.f90
+++ b/src/MNH/read_desfmn.f90
@@ -278,8 +278,8 @@ USE MODN_RECYCL_PARAM_n
USE MODN_IBM_PARAM_n
USE MODD_IBM_LSF, ONLY: LIBM_LSF
!
-USE MODD_FIRE
-USE MODN_FIRE
+USE MODD_FIRE_n
+USE MODN_FIRE_n
!
IMPLICIT NONE
!
@@ -616,8 +616,8 @@ IF (KMI == 1) THEN
CALL POSNAM(ILUDES,'NAM_FOREFIRE',GFOUND,ILUOUT)
IF (GFOUND) READ(UNIT=ILUDES,NML=NAM_FOREFIRE)
#endif
- CALL POSNAM(ILUDES,'NAM_FIRE',GFOUND,ILUOUT)
- IF (GFOUND) READ(UNIT=ILUDES,NML=NAM_FIRE)
+ CALL POSNAM(ILUDES,'NAM_FIREn',GFOUND,ILUOUT)
+ IF (GFOUND) READ(UNIT=ILUDES,NML=NAM_FIREn)
CALL POSNAM(ILUDES,'NAM_CONDSAMP',GFOUND,ILUOUT)
IF (GFOUND) READ(UNIT=ILUDES,NML=NAM_CONDSAMP)
CALL POSNAM(ILUDES,'NAM_BLOWSNOW',GFOUND,ILUOUT)
@@ -853,7 +853,7 @@ IF (NVERB >= 10) THEN
!
IF ( LBLAZE ) THEN
WRITE(UNIT=ILUOUT,FMT="('******************** BLAZE ********************')")
- WRITE(UNIT=ILUOUT,NML=NAM_FIRE)
+ WRITE(UNIT=ILUOUT,NML=NAM_FIREn)
END IF
!
WRITE(UNIT=ILUOUT,FMT="('************ CONDITIONAL SAMPLING *************')")
diff --git a/src/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90
index b00e4fff9..d5afd54b5 100644
--- a/src/MNH/read_exsegn.f90
+++ b/src/MNH/read_exsegn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-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 version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -410,8 +410,8 @@ USE MODN_TURB
USE MODN_TURB_CLOUD
USE MODN_TURB_n
USE MODN_VISCOSITY
-USE MODD_FIRE
-USE MODN_FIRE
+USE MODD_FIRE_n
+USE MODN_FIRE_n
!
IMPLICIT NONE
!
@@ -852,8 +852,8 @@ IF (KMI == 1) THEN
IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_2D_FRC)
CALL POSNAM(ILUSEG,'NAM_LATZ_EDFLX',GFOUND)
IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_LATZ_EDFLX)
- CALL POSNAM(ILUSEG,'NAM_FIRE',GFOUND,ILUOUT)
- IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_FIRE)
+ CALL POSNAM(ILUSEG,'NAM_FIREn',GFOUND,ILUOUT)
+ IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_FIREn)
CALL POSNAM(ILUSEG,'NAM_BLOWSNOW',GFOUND,ILUOUT)
IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_BLOWSNOW)
CALL POSNAM(ILUSEG,'NAM_VISC',GFOUND,ILUOUT)
diff --git a/src/MNH/read_field.f90 b/src/MNH/read_field.f90
index b1b7d3565..1488327fe 100644
--- a/src/MNH/read_field.f90
+++ b/src/MNH/read_field.f90
@@ -288,7 +288,7 @@ USE MODD_DYN_n, ONLY: LOCEAN
use modd_field, only: tfieldmetadata, tfieldlist, NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_NOTLISTED, &
TYPEDATE, TYPEREAL, TYPELOG, TYPEINT
USE MODD_FIELD_n, only: XZWS_DEFAULT
-USE MODD_FIRE, ONLY: CWINDFILTER, LBLAZE, LRESTA_ASE, LRESTA_AWC, LRESTA_EWAM, LRESTA_WLIM, LWINDFILTER
+USE MODD_FIRE_n, ONLY: CWINDFILTER, LBLAZE, LRESTA_ASE, LRESTA_AWC, LRESTA_EWAM, LRESTA_WLIM, LWINDFILTER
USE MODD_IBM_PARAM_n, ONLY: LIBM
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LATZ_EDFLX, ONLY: LTH_FLX, LUV_FLX
diff --git a/src/MNH/write_desfmn.f90 b/src/MNH/write_desfmn.f90
index afe05b41e..18d807785 100644
--- a/src/MNH/write_desfmn.f90
+++ b/src/MNH/write_desfmn.f90
@@ -156,7 +156,7 @@ END MODULE MODI_WRITE_DESFM_n
! ------------
USE MODD_CONF
USE MODD_DYN_n, ONLY: LHORELAX_SVLIMA, LHORELAX_SVFIRE
-USE MODD_FIRE, ONLY: LBLAZE
+USE MODD_FIRE_n, ONLY: LBLAZE
#ifdef MNH_FOREFIRE
USE MODD_FOREFIRE, ONLY: LFOREFIRE
#endif
@@ -219,7 +219,7 @@ USE MODN_IBM_PARAM_n
USE MODN_RECYCL_PARAM_n
USE MODN_PROFILER_n
USE MODN_STATION_n
-USE MODN_FIRE
+USE MODN_FIRE_n
USE MODN_FLYERS
!
IMPLICIT NONE
@@ -417,7 +417,7 @@ IF(LPASPOL) WRITE(UNIT=ILUSEG,NML=NAM_PASPOL)
#ifdef MNH_FOREFIRE
IF(LFOREFIRE) WRITE(UNIT=ILUSEG,NML=NAM_FOREFIRE)
#endif
-WRITE(UNIT=ILUSEG,NML=NAM_FIRE)
+WRITE(UNIT=ILUSEG,NML=NAM_FIREn)
IF(LCONDSAMP) WRITE(UNIT=ILUSEG,NML=NAM_CONDSAMP)
IF(LORILAM.AND.LUSECHEM) WRITE(UNIT=ILUSEG,NML=NAM_CH_ORILAM)
!
@@ -642,7 +642,7 @@ IF (NVERB >= 5) THEN
!
IF ( LBLAZE ) THEN
WRITE(UNIT=ILUOUT,FMT="('******************** BLAZE ********************')")
- WRITE(UNIT=ILUOUT,NML=NAM_FIRE)
+ WRITE(UNIT=ILUOUT,NML=NAM_FIREn)
END IF
!
WRITE(UNIT=ILUOUT,FMT="('********** CONDSAMP****************************')")
diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index a3c1e91fc..248bae0ee 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -219,7 +219,7 @@ USE MODD_EOL_SHARED_IO
USE MODD_FIELD_n
use modd_field, only: NMNHDIM_UNUSED, tfieldmetadata, tfieldlist, NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_NOTLISTED, &
TYPECHAR, TYPEDATE, TYPEINT, TYPELOG, TYPEREAL
-USE MODD_FIRE
+USE MODD_FIRE_n
#ifdef MNH_FOREFIRE
USE MODD_FOREFIRE
#endif
--
GitLab