From 638a11d6511af5fe2e97b3222691a9e6e6f10211 Mon Sep 17 00:00:00 2001 From: Batti Filippi <batti.filippi@gmail.com> Date: Wed, 13 Dec 2023 17:27:30 +0100 Subject: [PATCH] rebased to last branch --- src/LIB/FOREFIRE/C_ForeFire_Interface.c | 2 +- src/LIB/FOREFIRE/F_ForeFire_Interface.f90 | 2 +- src/LIB/FOREFIRE/coupling_forefiren.f90 | 2 +- src/LIB/FOREFIRE/init_forefiren.f90 | 3 ++- src/LIB/FOREFIRE/modd_forefire.f90 | 3 ++- src/LIB/FOREFIRE/modd_forefiren.f90 | 4 ++-- src/LIB/FOREFIRE/modn_forefire.f90 | 5 +++-- src/MNH/ini_one_wayn.f90 | 2 +- src/MNH/spawn_field2.f90 | 6 +++++- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/LIB/FOREFIRE/C_ForeFire_Interface.c b/src/LIB/FOREFIRE/C_ForeFire_Interface.c index a2fad3353..f00a1a015 100644 --- a/src/LIB/FOREFIRE/C_ForeFire_Interface.c +++ b/src/LIB/FOREFIRE/C_ForeFire_Interface.c @@ -1,5 +1,5 @@ /* -*MNH_LIC Copyright 1994-2014 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. diff --git a/src/LIB/FOREFIRE/F_ForeFire_Interface.f90 b/src/LIB/FOREFIRE/F_ForeFire_Interface.f90 index b9457e781..2792cbb56 100644 --- a/src/LIB/FOREFIRE/F_ForeFire_Interface.f90 +++ b/src/LIB/FOREFIRE/F_ForeFire_Interface.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 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. diff --git a/src/LIB/FOREFIRE/coupling_forefiren.f90 b/src/LIB/FOREFIRE/coupling_forefiren.f90 index a4f1a86d0..6308f5c59 100644 --- a/src/LIB/FOREFIRE/coupling_forefiren.f90 +++ b/src/LIB/FOREFIRE/coupling_forefiren.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 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. diff --git a/src/LIB/FOREFIRE/init_forefiren.f90 b/src/LIB/FOREFIRE/init_forefiren.f90 index 00c85c623..767f92d1c 100644 --- a/src/LIB/FOREFIRE/init_forefiren.f90 +++ b/src/LIB/FOREFIRE/init_forefiren.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 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. @@ -34,6 +34,7 @@ !! ------- !! P. Tulet CNRM !! X. Pialat SPE +!! J.B.Filippi (SPE) USE MODD_FOREFIRE USE MODD_FOREFIRE_n diff --git a/src/LIB/FOREFIRE/modd_forefire.f90 b/src/LIB/FOREFIRE/modd_forefire.f90 index 4afe97344..563962a05 100644 --- a/src/LIB/FOREFIRE/modd_forefire.f90 +++ b/src/LIB/FOREFIRE/modd_forefire.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 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. @@ -12,6 +12,7 @@ !! ------ ! : P. Tulet, LACy / CNRM !! : X. Pialat, SPE +! J.B.Filippi (SPE) ! Creation : 15.02.2012 ! !------------------------------------------------------------------------------- diff --git a/src/LIB/FOREFIRE/modd_forefiren.f90 b/src/LIB/FOREFIRE/modd_forefiren.f90 index bea6c9745..6c019357d 100644 --- a/src/LIB/FOREFIRE/modd_forefiren.f90 +++ b/src/LIB/FOREFIRE/modd_forefiren.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 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. @@ -8,7 +8,7 @@ !! AUTHOR !! ------ !! P. Tulet *Meteo France* -!! +!!! J.B.Filippi (SPE) !! MODIFICATIONS !! ------------- !! Original 07/08 diff --git a/src/LIB/FOREFIRE/modn_forefire.f90 b/src/LIB/FOREFIRE/modn_forefire.f90 index a1e956163..337ff9316 100644 --- a/src/LIB/FOREFIRE/modn_forefire.f90 +++ b/src/LIB/FOREFIRE/modn_forefire.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 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. @@ -11,7 +11,8 @@ !! AUTHOR !! ------ ! : P. Tulet (LACy / CNRM) -!! X. Pialat (SPE) +! X. Pialat (SPE) +! J.B.Filippi (SPE) ! Creation : 09.10.2010 !------------------------------------------------------------------------------- ! diff --git a/src/MNH/ini_one_wayn.f90 b/src/MNH/ini_one_wayn.f90 index aa8cb5ebb..70c20e10a 100644 --- a/src/MNH/ini_one_wayn.f90 +++ b/src/MNH/ini_one_wayn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-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. diff --git a/src/MNH/spawn_field2.f90 b/src/MNH/spawn_field2.f90 index 5f4c6a177..82bb5add4 100644 --- a/src/MNH/spawn_field2.f90 +++ b/src/MNH/spawn_field2.f90 @@ -175,7 +175,11 @@ USE MODD_IO, ONLY: TFILEDATA USE MODD_LATZ_EDFLX, ONLY: LTH_FLX, LUV_FLX USE MODD_LBC_n, ONLY: LBC_MODEL USE MODD_LUNIT_n, ONLY: TLUOUT -USE MODD_NSV +#ifdef MNH_FOREFIRE +USE MODD_NSV +#else +USE MODD_NSV ONLY: NSV, NSV_CSBEG, NSV_CSEND, NSV_PPBEG, NSV_PPEND, NSV_USER, TSVLIST +#endif USE MODD_RELFRC_n, ONLY: RELFRC_MODEL USE MODD_SPAWN ! -- GitLab