diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90 index 672d1a7af4a2a4bd23276beb9167c392474e2bcc..5ed1db232c6ecdba5f40fdf3c74fed0c6d303d30 100644 --- a/src/LIB/SURCOUCHE/src/mode_field.f90 +++ b/src/LIB/SURCOUCHE/src/mode_field.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2016-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2016-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. @@ -2401,7 +2401,7 @@ call Add_field2list( TFIELDDATA( & LTIMEDEP = .FALSE. ) ) call Add_field2list( TFIELDDATA( & - CMNHNAME = 'LSPHI', & + CMNHNAME = 'FMPHI', & CSTDNAME = '', & CLONGNAME = 'level set function', & CUNITS = '', & @@ -2414,7 +2414,7 @@ call Add_field2list( TFIELDDATA( & LTIMEDEP = .TRUE. ) ) call Add_field2list( TFIELDDATA( & - CMNHNAME = 'BMAP', & + CMNHNAME = 'FMBMAP', & CSTDNAME = '', & CLONGNAME = 'fire burning map', & CUNITS = 's', & @@ -2505,7 +2505,7 @@ call Add_field2list( TFIELDDATA( & LTIMEDEP = .TRUE. ) ) call Add_field2list( TFIELDDATA( & - CMNHNAME = 'FIRERW', & + CMNHNAME = 'FMROS', & CSTDNAME = '', & CLONGNAME = 'fire rate of spread', & CUNITS = 'm s-1', & @@ -2518,7 +2518,7 @@ call Add_field2list( TFIELDDATA( & LTIMEDEP = .TRUE. ) ) call Add_field2list( TFIELDDATA( & - CMNHNAME = 'FMR0', & + CMNHNAME = 'FMROS0', & CSTDNAME = '', & CLONGNAME = 'fire rate of spread no wind', & CUNITS = 'm s-1', & @@ -4011,16 +4011,16 @@ IF ( TRIM(CPROGRAM) == 'MESONH' .OR. TRIM(CPROGRAM) == 'DIAG' .OR. TRIM(CPR .OR. TRIM(CPROGRAM) == 'LFICDF' .OR. TRIM(CPROGRAM) == 'SPAWN' ) THEN call Goto_model_1field( 'FMREFINRATIOX', kfrom, kto, NREFINX ) call Goto_model_1field( 'FMREFINRATIOY', kfrom, kto, NREFINY ) - call Goto_model_1field( 'LSPHI', kfrom, kto, XLSPHI ) - call Goto_model_1field( 'BMAP', kfrom, kto, XBMAP ) - call Goto_model_1field( 'FMASE', kfrom, kto, XFMASE ) - call Goto_model_1field( 'FMAWC', kfrom, kto, XFMAWC ) + call Goto_model_1field( 'FMPHI', kfrom, kto, XLSPHI ) + call Goto_model_1field( 'FMBMAP', kfrom, kto, XBMAP ) + call Goto_model_1field( 'FMASE', kfrom, kto, XFMASE ) + call Goto_model_1field( 'FMAWC', kfrom, kto, XFMAWC ) call Goto_model_1field( 'FMWINDU', kfrom, kto, XFMWINDU ) call Goto_model_1field( 'FMWINDV', kfrom, kto, XFMWINDV ) call Goto_model_1field( 'FMWINDW', kfrom, kto, XFMWINDW ) - call Goto_model_1field( 'FMHWS', kfrom, kto, XFMHWS ) - call Goto_model_1field( 'FIRERW', kfrom, kto, XFIRERW ) - call Goto_model_1field( 'FMR0', kfrom, kto, XFMR0 ) + call Goto_model_1field( 'FMHWS', kfrom, kto, XFMHWS ) + call Goto_model_1field( 'FMROS', kfrom, kto, XFIRERW ) + call Goto_model_1field( 'FMROS0', kfrom, kto, XFMR0 ) call Goto_model_1field( 'FMFLUXHDH', kfrom, kto, XFMFLUXHDH ) call Goto_model_1field( 'FMFLUXHDW', kfrom, kto, XFMFLUXHDW ) call Goto_model_1field( 'FMGRADOROX', kfrom, kto, XFMGRADOROX ) diff --git a/src/MNH/firemodel.f90 b/src/MNH/firemodel.f90 index 1a8ce4139874325a59742a1c718e698f8e16cb44..dd61edc799d6f280a67f93479e6060323dd22e17 100644 --- a/src/MNH/firemodel.f90 +++ b/src/MNH/firemodel.f90 @@ -1694,7 +1694,7 @@ SUBROUTINE FIRE_READBMAP(TPFILE, PBMAP) WRITE(UNIT=ILUOUT,FMT=*) 'Extract BMap' ! Import data from file - CALL IO_Field_read( TFUELFILE, 'BMAP', PBMAP ) + CALL IO_Field_read( TFUELFILE, 'FMBMAP', PBMAP ) !* 5. Close file diff --git a/src/MNH/read_field.f90 b/src/MNH/read_field.f90 index 1488327fe0928654d088a67d3c2392a5b803da95..f32ec5b9496171ef19ec1b9c51beb9839a7d68a8 100644 --- a/src/MNH/read_field.f90 +++ b/src/MNH/read_field.f90 @@ -877,9 +877,9 @@ ENDIF IF (LBLAZE .AND. CCONF=='RESTA') THEN ! Blaze is not compliant with MNHVERSION(1)<5 ! Blaze begins with MNH 5.3.1 - CALL IO_Field_read(TPINIFILE,'LSPHI',PLSPHI,IRESP) + CALL IO_Field_read(TPINIFILE,'FMPHI',PLSPHI,IRESP) IF (IRESP /= 0) PLSPHI(:,:,:) = 0. - CALL IO_Field_read(TPINIFILE,'BMAP',PBMAP,IRESP) + CALL IO_Field_read(TPINIFILE,'FMBMAP',PBMAP,IRESP) IF (IRESP /= 0) PBMAP(:,:,:) = -1. CALL IO_Field_read(TPINIFILE,'FMASE',PFMASE,IRESP) IF(IRESP == 0) THEN diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90 index 0eb4fca4991126b2d02d53a2aa10e81df2e0167b..356692550d70a74414763532bb08f5314cfa10c1 100644 --- a/src/MNH/write_lfin.f90 +++ b/src/MNH/write_lfin.f90 @@ -455,10 +455,10 @@ CALL IO_Field_write(TPFILE,'THT',XTHT) IF (LBLAZE) THEN CALL IO_Field_write( TPFILE, 'FMREFINRATIOX', NREFINX ) CALL IO_Field_write( TPFILE, 'FMREFINRATIOY', NREFINY ) - CALL IO_Field_write( TPFILE, 'LSPHI', XLSPHI ) - CALL IO_Field_write( TPFILE, 'BMAP', XBMAP ) - CALL IO_Field_write( TPFILE, 'FMR0', XFMR0 ) - CALL IO_Field_write( TPFILE, 'FIRERW', XFIRERW ) + CALL IO_Field_write( TPFILE, 'FMPHI', XLSPHI ) + CALL IO_Field_write( TPFILE, 'FMBMAP', XBMAP ) + CALL IO_Field_write( TPFILE, 'FMROS0', XFMR0 ) + CALL IO_Field_write( TPFILE, 'FMROS', XFIRERW ) CALL IO_Field_write( TPFILE, 'FMASE', XFMASE ) CALL IO_Field_write( TPFILE, 'FMAWC', XFMAWC ) CALL IO_Field_write( TPFILE, 'FMFLUXHDH', XFMFLUXHDH )