From 36885ff46040b72244c9d2fdbe766909b6339eed Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Tue, 26 Sep 2017 11:37:34 +0200
Subject: [PATCH] Philippe 26/09/2017: IO: rename NAM_FMOUT in NAM_OUTPUT +
check when reading
---
.../KTEST/001_2Drelief/002_mesonh/EXSEG1.nam | 2 +-
.../001_2Drelief/002_mesonh/EXSEG1.nam_CEN4TH | 2 +-
.../001_2Drelief/002_mesonh/EXSEG1.nam_WENO | 2 +-
.../001_2Drelief/002_mesonh/README.namelist | 2 +-
.../KTEST/002_3Drelief/002_mesonh/EXSEG1.nam | 2 +-
.../002_3Drelief/002_mesonh/EXSEG1.nam_CEN4TH | 2 +-
.../002_3Drelief/002_mesonh/EXSEG1.nam_WENO | 2 +-
.../002_3Drelief/002_mesonh/README.namelist | 2 +-
MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam | 2 +-
.../003_KW78/002_mesonh/EXSEG1.nam_CEN4TH | 2 +-
.../KTEST/003_KW78/002_mesonh/EXSEG1.nam_WENO | 2 +-
.../KTEST/003_KW78/002_mesonh/README.namelist | 2 +-
.../KTEST/004_Reunion/003_mesonh/EXSEG1.nam | 2 +-
.../004_Reunion/003_mesonh/EXSEG1.nam_CEN4TH | 2 +-
.../004_Reunion/003_mesonh/EXSEG1.nam_WENO | 2 +-
.../004_Reunion/003_mesonh/README.namelist | 2 +-
.../007_16janvier/008_run2/EXSEG1.nam.src | 2 +-
.../008_run2/EXSEG1.nam.src_CEN4TH | 2 +-
.../008_run2/EXSEG1.nam.src_WENO | 2 +-
.../007_16janvier/008_run2/README.namelist | 2 +-
.../008_run2/run_mesonh_xyz.ihm | 2 +-
.../009_ICARTT/003_mesonh/EXSEG1.nam.src | 2 +-
.../KTEST/011_KW78CHEM/002_mesonh/EXSEG1.nam | 2 +-
MY_RUN/KTEST/012_dust/003_run/EXSEG1.nam | 2 +-
MY_RUN/KTEST/012_dust/004_restart/EXSEG1.nam | 2 +-
.../1_INPUT_MNH/EXSEG1.nam_OCEAN | 2 +-
.../1_INPUT_MNH/EXSEG1.nam_WAVE | 2 +-
MY_RUN/KTEST/014_LIMA/002_mesonh/EXSEG1.nam | 2 +-
.../SURCOUCHE/src/mode_io_manage_struct.f90 | 4 +--
src/MNH/default_desfmn.f90 | 8 +++---
src/MNH/{modd_fmout.f90 => modd_output.f90} | 16 ++++++------
src/MNH/modeln.f90 | 2 +-
src/MNH/{modn_fmout.f90 => modn_output.f90} | 26 ++++++++++---------
src/MNH/read_desfmn.f90 | 12 ++++++---
src/MNH/read_exsegn.f90 | 11 +++++---
src/MNH/write_desfmn.f90 | 10 +++----
36 files changed, 79 insertions(+), 66 deletions(-)
rename src/MNH/{modd_fmout.f90 => modd_output.f90} (89%)
rename src/MNH/{modn_fmout.f90 => modn_output.f90} (71%)
diff --git a/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam b/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam
index 92f60913b..e9ee7ee30 100644
--- a/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam
@@ -16,4 +16,4 @@
/
&NAM_DYN XSEGLEN =1080., XASSELIN = 0.2, LCORIO = F,
XALKTOP = 0.005, XALZBOT = 12570., LNUMDIFU =.T. /
-&NAM_FMOUT XBAK_TIME(1,1) = 360., XBAK_TIME(1,2) = 720., XBAK_TIME(1,3) = 1080. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 360., XBAK_TIME(1,2) = 720., XBAK_TIME(1,3) = 1080. /
diff --git a/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam_CEN4TH b/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam_CEN4TH
index 92f60913b..e9ee7ee30 100644
--- a/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam_CEN4TH
+++ b/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam_CEN4TH
@@ -16,4 +16,4 @@
/
&NAM_DYN XSEGLEN =1080., XASSELIN = 0.2, LCORIO = F,
XALKTOP = 0.005, XALZBOT = 12570., LNUMDIFU =.T. /
-&NAM_FMOUT XBAK_TIME(1,1) = 360., XBAK_TIME(1,2) = 720., XBAK_TIME(1,3) = 1080. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 360., XBAK_TIME(1,2) = 720., XBAK_TIME(1,3) = 1080. /
diff --git a/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam_WENO b/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam_WENO
index de4a0c676..701945300 100644
--- a/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam_WENO
+++ b/MY_RUN/KTEST/001_2Drelief/002_mesonh/EXSEG1.nam_WENO
@@ -16,4 +16,4 @@
/
&NAM_DYN XSEGLEN =1080., XASSELIN = 0.2, LCORIO = F,
XALKTOP = 0.005, XALZBOT = 12570., LNUMDIFU =.F. /
-&NAM_FMOUT XBAK_TIME(1,1) = 360., XBAK_TIME(1,2) = 720., XBAK_TIME(1,3) = 1080. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 360., XBAK_TIME(1,2) = 720., XBAK_TIME(1,3) = 1080. /
diff --git a/MY_RUN/KTEST/001_2Drelief/002_mesonh/README.namelist b/MY_RUN/KTEST/001_2Drelief/002_mesonh/README.namelist
index 624970696..1f8db2472 100644
--- a/MY_RUN/KTEST/001_2Drelief/002_mesonh/README.namelist
+++ b/MY_RUN/KTEST/001_2Drelief/002_mesonh/README.namelist
@@ -78,7 +78,7 @@ XALKTOP = 0.005 ; maximum value of the Rayleigh damping (in s-1)
XALZBOT = 12570. ; height (in meter) in the physical space of the upper absorbing layer base
LNUMDIFU =.T. ; switch to activate the numerical diffusion for momentum
-&NAM_FMOUT
+&NAM_OUTPUT
XBAK_TIME(1,1) = 360. ; an array of increments (in second) from the beginning of the segment
to the instant where the i-th fields output on FM-files is realized by model "m"
XBAK_TIME(1,2) = 720.
diff --git a/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam b/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam
index da7fd61f5..4bb950b09 100644
--- a/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam
@@ -18,5 +18,5 @@
&NAM_DYN XSEGLEN = 1000., XASSELIN = 0.2, LCORIO = F,
XALKTOP = 0.005, XALZBOT = 12570.,
LNUMDIFU =.F. /
-&NAM_FMOUT XBAK_TIME(1,1) = 500., XBAK_TIME(1,2) = 1000. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 500., XBAK_TIME(1,2) = 1000. /
diff --git a/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam_CEN4TH b/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam_CEN4TH
index 888189cab..152069116 100644
--- a/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam_CEN4TH
+++ b/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam_CEN4TH
@@ -18,5 +18,5 @@
&NAM_DYN XSEGLEN = 1000., XASSELIN = 0.2, LCORIO = F,
XALKTOP = 0.005, XALZBOT = 12570.,
LNUMDIFU =.F. /
-&NAM_FMOUT XBAK_TIME(1,1) = 500., XBAK_TIME(1,2) = 1000. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 500., XBAK_TIME(1,2) = 1000. /
diff --git a/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam_WENO b/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam_WENO
index 3dc71ecc2..e23da91df 100644
--- a/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam_WENO
+++ b/MY_RUN/KTEST/002_3Drelief/002_mesonh/EXSEG1.nam_WENO
@@ -18,5 +18,5 @@
&NAM_DYN XSEGLEN = 1000., XASSELIN = 0.2, LCORIO = F,
XALKTOP = 0.005, XALZBOT = 12570.,
LNUMDIFU =.F. /
-&NAM_FMOUT XBAK_TIME(1,1) = 500., XBAK_TIME(1,2) = 1000. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 500., XBAK_TIME(1,2) = 1000. /
diff --git a/MY_RUN/KTEST/002_3Drelief/002_mesonh/README.namelist b/MY_RUN/KTEST/002_3Drelief/002_mesonh/README.namelist
index c98f9fdf8..9c9405520 100644
--- a/MY_RUN/KTEST/002_3Drelief/002_mesonh/README.namelist
+++ b/MY_RUN/KTEST/002_3Drelief/002_mesonh/README.namelist
@@ -69,7 +69,7 @@ XALKTOP = 0.005 ; maximum value of the Rayleigh damping (in s-1)
XALZBOT = 12570. ; height (in meter) in the physical space of the upper absorbing layer base
LNUMDIFU =.F. ; switch to activate the numerical diffusion for momentum
-&NAM_FMOUT
+&NAM_OUTPUT
XBAK_TIME(1,1) = 500. ; an array of increments (in second) from the beginning of the segment
to the instant where the i-th fields output on FM-files is realized by model "m"
XBAK_TIME(1,2) = 1000.
diff --git a/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam b/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam
index 6d665c5be..7105c9ab4 100644
--- a/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam
@@ -22,6 +22,6 @@
&NAM_DYN XSEGLEN = 1800.,
XASSELIN = 0.2, LCORIO = F,
LNUMDIFU = T /
-&NAM_FMOUT XBAK_TIME(1,1) = 450., XBAK_TIME(1,2) = 900.,
+&NAM_OUTPUT XBAK_TIME(1,1) = 450., XBAK_TIME(1,2) = 900.,
XBAK_TIME(1,3) = 1350., XBAK_TIME(1,4) = 1800. /
diff --git a/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam_CEN4TH b/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam_CEN4TH
index f7161715c..d976f57c8 100644
--- a/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam_CEN4TH
+++ b/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam_CEN4TH
@@ -22,6 +22,6 @@
&NAM_DYN XSEGLEN = 1800.,
XASSELIN = 0.2, LCORIO = F,
LNUMDIFU = T /
-&NAM_FMOUT XBAK_TIME(1,1) = 450., XBAK_TIME(1,2) = 900.,
+&NAM_OUTPUT XBAK_TIME(1,1) = 450., XBAK_TIME(1,2) = 900.,
XBAK_TIME(1,3) = 1350., XBAK_TIME(1,4) = 1800. /
diff --git a/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam_WENO b/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam_WENO
index c5f6bc33f..d1e0fde4f 100644
--- a/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam_WENO
+++ b/MY_RUN/KTEST/003_KW78/002_mesonh/EXSEG1.nam_WENO
@@ -23,6 +23,6 @@
&NAM_DYN XSEGLEN = 1800.,
XASSELIN = 0.2, LCORIO = F,
LNUMDIFU = T /
-&NAM_FMOUT XBAK_TIME(1,1) = 450., XBAK_TIME(1,2) = 900.,
+&NAM_OUTPUT XBAK_TIME(1,1) = 450., XBAK_TIME(1,2) = 900.,
XBAK_TIME(1,3) = 1350., XBAK_TIME(1,4) = 1800. /
diff --git a/MY_RUN/KTEST/003_KW78/002_mesonh/README.namelist b/MY_RUN/KTEST/003_KW78/002_mesonh/README.namelist
index c038946a7..aafe6d768 100644
--- a/MY_RUN/KTEST/003_KW78/002_mesonh/README.namelist
+++ b/MY_RUN/KTEST/003_KW78/002_mesonh/README.namelist
@@ -87,7 +87,7 @@ LCORIO = F ; switch for the Coriolis parameters
.TRUE. the Earth rotation is taken into account )
LNUMDIFU =.T. ; switch to activate the numerical diffusion for momentum
-&NAM_FMOUT
+&NAM_OUTPUT
XBAK_TIME(1,1) = 450. ; an array of increments (in second) from the beginning of the segment
to the instant where the i-th fields output on FM-files is realized by model "m"
XBAK_TIME(1,2) = 900.
diff --git a/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam b/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam
index 22a053af2..506c6feb9 100644
--- a/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam
+++ b/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam
@@ -26,7 +26,7 @@
&NAM_DYN XSEGLEN = 40.,
LCORIO = F, LNUMDIFU = F,
XALKTOP = 0.01, XALZBOT = 14000. /
-&NAM_FMOUT
+&NAM_OUTPUT
XBAK_TIME(1,1) = 40., XBAK_TIME(1,2) = 10.,
XBAK_TIME(1,3) = 20., XBAK_TIME(1,4) = 30. /
&NAM_BUDGET CBUTYPE='CART', XBULEN=200.,
diff --git a/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam_CEN4TH b/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam_CEN4TH
index 7ad9081b6..59373a59e 100644
--- a/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam_CEN4TH
+++ b/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam_CEN4TH
@@ -25,7 +25,7 @@
&NAM_DYN XSEGLEN = 40.,
LCORIO = F, LNUMDIFU = T,
XALKTOP = 0.01, XALZBOT = 14000. /
-&NAM_FMOUT XBAK_TIME(1,1) = 10., XBAK_TIME(1,2) = 20.,
+&NAM_OUTPUT XBAK_TIME(1,1) = 10., XBAK_TIME(1,2) = 20.,
XBAK_TIME(1,3) = 30., XBAK_TIME(1,4) = 40. /
&NAM_BUDGET CBUTYPE='CART', XBULEN=200.,
NBUKL=2, NBUKH=51, NBUIL=15, NBUIH=64, NBUJL=15, NBUJH=68,
diff --git a/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam_WENO b/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam_WENO
index 05bb02006..9976fce0a 100644
--- a/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam_WENO
+++ b/MY_RUN/KTEST/004_Reunion/003_mesonh/EXSEG1.nam_WENO
@@ -25,7 +25,7 @@
&NAM_DYN XSEGLEN = 40.,
LCORIO = F, LNUMDIFU = F,
XALKTOP = 0.01, XALZBOT = 14000. /
-&NAM_FMOUT XBAK_TIME(1,1) = 10., XBAK_TIME(1,2) = 20.,
+&NAM_OUTPUT XBAK_TIME(1,1) = 10., XBAK_TIME(1,2) = 20.,
XBAK_TIME(1,3) = 30., XBAK_TIME(1,4) = 40. /
&NAM_BUDGET CBUTYPE='CART', XBULEN=200.,
NBUKL=2, NBUKH=51, NBUIL=15, NBUIH=64, NBUJL=15, NBUJH=68,
diff --git a/MY_RUN/KTEST/004_Reunion/003_mesonh/README.namelist b/MY_RUN/KTEST/004_Reunion/003_mesonh/README.namelist
index 0713a0b5c..e8abf401b 100644
--- a/MY_RUN/KTEST/004_Reunion/003_mesonh/README.namelist
+++ b/MY_RUN/KTEST/004_Reunion/003_mesonh/README.namelist
@@ -121,7 +121,7 @@ LCORIO = F ; switch for the Coriolis parameters
.TRUE. the Earth rotation is taken into account )
LNUMDIFU =.T. ; switch to activate the numerical diffusion for momentum
-&NAM_FMOUT
+&NAM_OUTPUT
XBAK_TIME(1,1) = 10. ; an array of increments (in second) from the beginning of the segment
to the instant where the i-th fields output on FM-files is realized by model "m"
XBAK_TIME(1,2) = 20.
diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src
index e608c64e9..18d95d283 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src
@@ -24,7 +24,7 @@
&NAM_DYN XSEGLEN = 300., LCORIO = T, LNUMDIFU = T,
XALKTOP = 0.001, XALZBOT = 14500. /
&NAM_NESTING NDAD(2) = 1, NDTRATIO(2) = 4, XWAY(2) = 2. /
-&NAM_FMOUT XBAK_TIME(1,1) = 300. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 300. /
&NAM_DIAG_SURFn /
&NAM_ISBAn CSCOND="NP89", CALBEDO="DRY",CROUGH='NONE',
CC1DRY='DEF', CSOILFRZ='DEF', CDIFSFCOND='DEF', CSNOWRES='DEF' /
diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH
index ff5b7acc1..6d20751b4 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH
@@ -25,7 +25,7 @@
&NAM_DYN XSEGLEN = 300., LCORIO = T, LNUMDIFU = T,
XALKTOP = 0.001, XALZBOT = 14500. /
&NAM_NESTING NDAD(2) = 1, NDTRATIO(2) = 4, XWAY(2) = 2. /
-&NAM_FMOUT XBAK_TIME(1,1) = 300. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 300. /
&NAM_DIAG_SURFn /
&NAM_ISBAn CSCOND="NP89", CALBEDO="DRY",CROUGH='NONE',
CC1DRY='DEF', CSOILFRZ='DEF', CDIFSFCOND='DEF', CSNOWRES='DEF' /
diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO
index 9c3f67f7c..4a27fcadb 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO
@@ -26,7 +26,7 @@
&NAM_DYN XSEGLEN = 300., LCORIO = T, LNUMDIFU = F,
XALKTOP = 0.001, XALZBOT = 14500. /
&NAM_NESTING NDAD(2) = 1, NDTRATIO(2) = 3, XWAY(2) = 2. /
-&NAM_FMOUT XBAK_TIME(1,1) = 300. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 300. /
&NAM_DIAG_SURFn /
&NAM_ISBAn CSCOND="NP89", CALBEDO="DRY",CROUGH='NONE',
CC1DRY='DEF', CSOILFRZ='DEF', CDIFSFCOND='DEF', CSNOWRES='DEF' /
diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/README.namelist b/MY_RUN/KTEST/007_16janvier/008_run2/README.namelist
index c49a42dd1..601cbd062 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/README.namelist
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/README.namelist
@@ -134,7 +134,7 @@ NDAD(2) = 1 ; model number of the father of each model (here the father of mo
NDTRATIO(2) = 4 ; ratio between time step of model 2 and its father (model 1)
XWAY(2) = 2. ; interactive nesting level for model 2 and its father
-&NAM_FMOUT
+&NAM_OUTPUT
XBAK_TIME(1,1) = 300. ; an array of increments (in second) from the beginning of the segment
to the instant where the i-th fields output on FM-files is realized by model "m"
diff --git a/MY_RUN/KTEST/007_16janvier_scandollar/008_run2/run_mesonh_xyz.ihm b/MY_RUN/KTEST/007_16janvier_scandollar/008_run2/run_mesonh_xyz.ihm
index 99e1ffb86..a46b16667 100755
--- a/MY_RUN/KTEST/007_16janvier_scandollar/008_run2/run_mesonh_xyz.ihm
+++ b/MY_RUN/KTEST/007_16janvier_scandollar/008_run2/run_mesonh_xyz.ihm
@@ -110,7 +110,7 @@ cat <<EOF > EXSEG1.nam
&NAM_DYN XSEGLEN = 300., LCORIO = T, LNUMDIFU = T,
XALKTOP = 0.001, XALZBOT = 14500. /
&NAM_NESTING NDAD(2) = 1, NDTRATIO(2) = 4, XWAY(2) = 2. /
-&NAM_FMOUT XBAK_TIME(1,1) = 300. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 300. /
&NAM_DIAG_SURFn /
&NAM_ISBAn CSCOND="NP89", CALBEDO="DRY", CROUGH='Z01D',
CC1DRY='DEF', CSOILFRZ='DEF', CDIFSFCOND='DEF', CSNOWRES='DEF' /
diff --git a/MY_RUN/KTEST/009_ICARTT/003_mesonh/EXSEG1.nam.src b/MY_RUN/KTEST/009_ICARTT/003_mesonh/EXSEG1.nam.src
index 0414018ee..28c3218b2 100644
--- a/MY_RUN/KTEST/009_ICARTT/003_mesonh/EXSEG1.nam.src
+++ b/MY_RUN/KTEST/009_ICARTT/003_mesonh/EXSEG1.nam.src
@@ -53,7 +53,7 @@
&NAM_DYN XSEGLEN = 7200, XASSELIN = 0.2, LCORIO = T, LNUMDIFU = F,
XALKTOP = 0.005, XALZBOT = 14000. /
&NAM_NESTING /
-&NAM_FMOUT XBAK_TIME(1,1)=3600., XBAK_TIME(1,2)=7200. /
+&NAM_OUTPUT XBAK_TIME(1,1)=3600., XBAK_TIME(1,2)=7200. /
&NAM_BUDGET CBUTYPE='NONE' /
&NAM_ISBAn /
&NAM_SEAFLUXn /
diff --git a/MY_RUN/KTEST/011_KW78CHEM/002_mesonh/EXSEG1.nam b/MY_RUN/KTEST/011_KW78CHEM/002_mesonh/EXSEG1.nam
index c9f24bb84..23f90e751 100644
--- a/MY_RUN/KTEST/011_KW78CHEM/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/KTEST/011_KW78CHEM/002_mesonh/EXSEG1.nam
@@ -43,6 +43,6 @@
&NAM_DYN XSEGLEN = 1800.,
XASSELIN = 0.2, LCORIO = F,
LNUMDIFU = F/
-&NAM_FMOUT XBAK_TIME(1,1) = 450., XBAK_TIME(1,2) = 900.,
+&NAM_OUTPUT XBAK_TIME(1,1) = 450., XBAK_TIME(1,2) = 900.,
XBAK_TIME(1,3) = 1350., XBAK_TIME(1,4) = 1800. /
diff --git a/MY_RUN/KTEST/012_dust/003_run/EXSEG1.nam b/MY_RUN/KTEST/012_dust/003_run/EXSEG1.nam
index 1ddcd2ade..7c39262ce 100644
--- a/MY_RUN/KTEST/012_dust/003_run/EXSEG1.nam
+++ b/MY_RUN/KTEST/012_dust/003_run/EXSEG1.nam
@@ -65,7 +65,7 @@
LNUMDIFU = T,
XALKTOP = 0.001,
XALZBOT = 16000. /
-&NAM_FMOUT
+&NAM_OUTPUT
XBAK_TIME(1,1)=10800. ,
XBAK_TIME(1,2)=21600. ,
XBAK_TIME(1,3)=32400. ,
diff --git a/MY_RUN/KTEST/012_dust/004_restart/EXSEG1.nam b/MY_RUN/KTEST/012_dust/004_restart/EXSEG1.nam
index 5d5850336..eef13b52a 100644
--- a/MY_RUN/KTEST/012_dust/004_restart/EXSEG1.nam
+++ b/MY_RUN/KTEST/012_dust/004_restart/EXSEG1.nam
@@ -63,7 +63,7 @@
LNUMDIFU = T,
XALKTOP = 0.001,
XALZBOT = 16000. /
-&NAM_FMOUT
+&NAM_OUTPUT
XBAK_TIME(1,1)=10800. ,
XBAK_TIME(1,2)=21600. ,
XBAK_TIME(1,3)=32400. ,
diff --git a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_OCEAN b/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_OCEAN
index a5ea42e7d..068935bd7 100755
--- a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_OCEAN
+++ b/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_OCEAN
@@ -47,7 +47,7 @@
XALKTOP = 0.001,
XALZBOT = 1200. /
-&NAM_FMOUT XFMOUT(1,1)=360. /
+&NAM_OUTPUT XFMOUT(1,1)=360. /
&NAM_CONFn LUSERV=.TRUE.,
LUSECI=.TRUE.,
diff --git a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_WAVE b/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_WAVE
index d44866669..a11e72595 100755
--- a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_WAVE
+++ b/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_WAVE
@@ -47,7 +47,7 @@
XALKTOP = 0.001,
XALZBOT = 1200. /
-&NAM_FMOUT XFMOUT(1,1)=360. /
+&NAM_OUTPUT XFMOUT(1,1)=360. /
&NAM_CONFn LUSERV=.TRUE.,
LUSECI=.TRUE.,
diff --git a/MY_RUN/KTEST/014_LIMA/002_mesonh/EXSEG1.nam b/MY_RUN/KTEST/014_LIMA/002_mesonh/EXSEG1.nam
index c84b5bf6e..29f347e01 100644
--- a/MY_RUN/KTEST/014_LIMA/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/KTEST/014_LIMA/002_mesonh/EXSEG1.nam
@@ -62,7 +62,7 @@
LNUMDIFTH = .F.,
LNUMDIFSV = .F. /
-&NAM_FMOUT XBAK_TIME(1,1) = 1800., XBAK_TIME(1,2) = 3600. /
+&NAM_OUTPUT XBAK_TIME(1,1) = 1800., XBAK_TIME(1,2) = 3600. /
&NAM_BUDGET CBUTYPE = 'CART',
NBUMOD = 1,
diff --git a/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90 b/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
index c1569453a..db50a9e88 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
@@ -26,11 +26,11 @@ USE MODD_CONF
USE MODD_CONF_n
USE MODD_DYN, ONLY : XSEGLEN
USE MODD_DYN_n, ONLY : DYN_MODEL
-USE MODD_FMOUT
USE MODD_IO_SURF_MNH,ONLY : IO_SURF_MNH_MODEL
USE MODD_NESTING, ONLY : CDAD_NAME,NDAD
USE MODD_NSV, ONLY: NSV
USE MODD_OUT_n, ONLY : OUT_MODEL
+USE MODD_OUTPUT
USE MODD_VAR_ll, ONLY : IP
USE MODE_FIELD
!
@@ -574,8 +574,8 @@ END SUBROUTINE IO_PREPARE_BAKOUT_STRUCT
!
SUBROUTINE IO_FILE_ADD2LIST(TPFILE,HNAME,HTYPE,HMODE,KLFINPRAR,KLFITYPE,KLFIVERB,TPDADFILE,OOLD)
!
-USE MODD_FMOUT, ONLY : LOUT_COMPRESS,LOUT_REDUCE_FLOAT_PRECISION,NOUT_COMPRESS_LEVEL
USE MODE_MODELN_HANDLER, ONLY : GET_CURRENT_MODEL_INDEX
+USE MODD_OUTPUT, ONLY : LOUT_COMPRESS,LOUT_REDUCE_FLOAT_PRECISION,NOUT_COMPRESS_LEVEL
!
TYPE(TFILEDATA),POINTER, INTENT(INOUT) :: TPFILE !File structure to return
CHARACTER(LEN=*), INTENT(IN) :: HNAME !Filename
diff --git a/src/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90
index 8c51e1579..0abb32643 100644
--- a/src/MNH/default_desfmn.f90
+++ b/src/MNH/default_desfmn.f90
@@ -60,7 +60,7 @@ END MODULE MODI_DEFAULT_DESFM_n
!! Module MODD_DYN : XSEGLEN,XASSELIN,LCORIO,LNUMDIFF
!! XALKTOP,XALZBOT
!!
-!! Module MODD_FMOUT : XOUT
+!! Module MODD_OUTPUT : XOUT
!!
!! Module MODD_NESTING : NDAD(m),NDTRATIO(m),XWAY(m)
!!
@@ -174,7 +174,7 @@ END MODULE MODI_DEFAULT_DESFM_n
!! Modifications 24/11/96 (Masson) add LREFRESH_ALL in deep convection
!! Modifications 12/02/96 (Lafore) transformation to DEFAULT_DESFM_n for spawning
!! Modifications 22/07/96 (Lafore) gridnesting implementation
-!! Modifications 29/07/96 (Lafore) add the module MODD_FMOUT
+!! Modifications 29/07/96 (Lafore) add the module MODD_FMOUT (renamed MODD_OUTPUT)
!! Modifications 23/06/97 (Stein) add the equation system name
!! Modifications 10/07/97 (Masson) add MODD_PARAM_GROUNDn : CROUGH
!! Modifications 28/07/97 (Masson) remove LREFRESH_ALL and LSTEADY_DMASS
@@ -228,7 +228,7 @@ USE MODD_CONF ! For INIT only DEFAULT_DESFM1
USE MODD_CONFZ
USE MODD_DYN
USE MODD_NESTING
-USE MODD_FMOUT
+USE MODD_OUTPUT
USE MODD_SERIES
USE MODD_CONF_n ! modules used to set the default values is only
USE MODD_LUNIT_n ! the one corresponding to model 1. These memory
@@ -489,7 +489,7 @@ XTNUDGING = 21600.
!
!-------------------------------------------------------------------------------
!
-!* 9. SET DEFAULT VALUES FOR MODD_FMOUT and MODD_OUT_n :
+!* 9. SET DEFAULT VALUES FOR MODD_OUTPUT and MODD_OUT_n :
! ------------------------------------------------
!
!
diff --git a/src/MNH/modd_fmout.f90 b/src/MNH/modd_output.f90
similarity index 89%
rename from src/MNH/modd_fmout.f90
rename to src/MNH/modd_output.f90
index 65be0daed..cef31e97c 100644
--- a/src/MNH/modd_fmout.f90
+++ b/src/MNH/modd_output.f90
@@ -8,17 +8,17 @@
! $Source$ $Revision$
! MASDEV4_7 modd 2006/05/18 13:07:25
!-----------------------------------------------------------------
-! #################
- MODULE MODD_FMOUT
-! #################
+! ##################
+ MODULE MODD_OUTPUT
+! ##################
!
-!!**** *MODD_FMOUT* - declaration of informations on the instants for the
+!!**** *MODD_OUTPUT* - declaration of informations on the instants for the
!! outputs of all models
!!
!! PURPOSE
!! -------
-! The purpose of this module is to declare the instants for the outputs
-!! realized by all models.
+! The purpose of this module is to declare the instants and some parameters
+! (compression and precision reduction) of the outputs realized by all models.
! Introduced to facilitate the output FM-file managment in case of nesting
!
!!** IMPLICIT ARGUMENTS
@@ -29,7 +29,7 @@
!!
!! REFERENCE
!! ---------
-!! Book2 of Meso-NH documentation (module MODD_FMOUT)
+!! Book2 of Meso-NH documentation (module MODD_OUTPUT)
!!
!! AUTHOR
!! ------
@@ -75,4 +75,4 @@ REAL,SAVE,DIMENSION(JPMODELMAX) :: XBAK_TIME_FREQ_FIRST = 0., XOUT_TIME_FREQ_FIR
CHARACTER(LEN=NMNHNAMELGTMAX),SAVE,ALLOCATABLE,DIMENSION(:,:) :: COUT_VAR ! Name of the fields to output
!
!
-END MODULE MODD_FMOUT
+END MODULE MODD_OUTPUT
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index bed3d7929..ce079b293 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -264,7 +264,7 @@ USE MODD_DYN
USE MODD_DYNZD
USE MODD_CONF
USE MODD_NESTING
-USE MODD_FMOUT
+USE MODD_OUTPUT
USE MODD_BUDGET
USE MODD_PARAMETERS
USE MODD_PARAM_ICE, ONLY : LWARM,LSEDIC,LCONVHG,LDEPOSC
diff --git a/src/MNH/modn_fmout.f90 b/src/MNH/modn_output.f90
similarity index 71%
rename from src/MNH/modn_fmout.f90
rename to src/MNH/modn_output.f90
index 388fb7057..78946acdf 100644
--- a/src/MNH/modn_fmout.f90
+++ b/src/MNH/modn_output.f90
@@ -8,25 +8,27 @@
! $Source$ $Revision$
! MASDEV4_7 modn 2006/05/18 13:07:25
!-----------------------------------------------------------------
-! #################
- MODULE MODN_FMOUT
-! #################
+! ##################
+ MODULE MODN_OUTPUT
+! ##################
!
-!!**** *MODN_FMOUT* - declaration of namelist NAM_FMOUT
+!!**** *MODN_OUTPUT* - declaration of namelist NAM_OUTPUT
!!
!! PURPOSE
!! -------
-! The purpose of this module is to specify the namelist NAM_FMOUT
-! which concerns the instants for the outputs realized by all models.
+! The purpose of this module is to specify the namelist NAM_OUTPUT
+! which concerns the instants and some parameters (compression and precision reduction)
+! of the outputs realized by all models.
!
!!** IMPLICIT ARGUMENTS
!! ------------------
-!! Module MODD_FMOUT : contains declaration of the variables describing
-!! the instants for the outputs
+!! Module MODD_OUTPUT : contains declaration of the variables describing
+!! the instants and some parameters (compression and
+!! precision reduction) of the outputs
!!
!! REFERENCE
!! ---------
-!! Book2 of Meso-NH documentation (module MODD_FMOUT)
+!! Book2 of Meso-NH documentation (module MODD_OUTPUT)
!!
!! AUTHOR
!! ------
@@ -41,11 +43,11 @@
!* 0. DECLARATIONS
! ------------
!
-USE MODD_FMOUT
+USE MODD_OUTPUT
!
IMPLICIT NONE
!
-NAMELIST/NAM_FMOUT/LBAK_BEG,LBAK_END,&
+NAMELIST/NAM_OUTPUT/LBAK_BEG,LBAK_END,&
XBAK_TIME,NBAK_STEP,&
NBAK_STEP_FREQ,NBAK_STEP_FREQ_FIRST,&
XBAK_TIME_FREQ,XBAK_TIME_FREQ_FIRST, &
@@ -57,4 +59,4 @@ NAMELIST/NAM_FMOUT/LBAK_BEG,LBAK_END,&
LOUT_REDUCE_FLOAT_PRECISION, &
LOUT_COMPRESS, NOUT_COMPRESS_LEVEL
!
-END MODULE MODN_FMOUT
+END MODULE MODN_OUTPUT
diff --git a/src/MNH/read_desfmn.f90 b/src/MNH/read_desfmn.f90
index 4e727b307..7611de06a 100644
--- a/src/MNH/read_desfmn.f90
+++ b/src/MNH/read_desfmn.f90
@@ -196,12 +196,14 @@ END MODULE MODI_READ_DESFM_n
!
!* 0. DECLARATIONS
! ------------
+USE MODD_IO_ll, ONLY : NVERB_FATAL
USE MODD_PARAMETERS
+!
USE MODN_BUDGET
USE MODN_CONF
USE MODN_DYN
USE MODN_NESTING
-USE MODN_FMOUT
+USE MODN_OUTPUT
USE MODN_LES
USE MODN_CONF_n
USE MODN_DYN_n
@@ -254,6 +256,7 @@ USE MODN_2D_FRC
!
USE MODN_PARAM_LIMA
!
+USE MODE_MSG
USE MODE_POS
USE MODE_FM
!
@@ -423,19 +426,22 @@ IF (KMI == 1) THEN
IF (GFOUND) READ(UNIT=ILUDES,NML=NAM_DYN)
CALL POSNAM(ILUDES,'NAM_NESTING',GFOUND)
IF (GFOUND) READ(UNIT=ILUDES,NML=NAM_NESTING)
- CALL POSNAM(ILUDES,'NAM_FMOUT',GFOUND)
+ CALL POSNAM(ILUDES,'NAM_OUTPUT',GFOUND)
IF (GFOUND) THEN
IF (.NOT.ALLOCATED(XBAK_TIME)) ALLOCATE(XBAK_TIME(NMODEL,JPOUTMAX))
IF (.NOT.ALLOCATED(XOUT_TIME)) ALLOCATE(XOUT_TIME(NMODEL,JPOUTMAX))
IF (.NOT.ALLOCATED(NBAK_STEP)) ALLOCATE(NBAK_STEP(NMODEL,JPOUTMAX))
IF (.NOT.ALLOCATED(NOUT_STEP)) ALLOCATE(NOUT_STEP(NMODEL,JPOUTMAX))
IF (.NOT.ALLOCATED(COUT_VAR)) ALLOCATE(COUT_VAR (NMODEL,JPOUTVARMAX))
- READ(UNIT=ILUDES,NML=NAM_FMOUT)
+ READ(UNIT=ILUDES,NML=NAM_OUTPUT)
XBAK_TIME(:,:) = XNEGUNDEF
XOUT_TIME(:,:) = XNEGUNDEF
NBAK_STEP(:,:) = NNEGUNDEF
NOUT_STEP(:,:) = NNEGUNDEF
COUT_VAR(:,:) = ''
+ ELSE
+ CALL POSNAM(ILUDES,'NAM_FMOUT',GFOUND)
+ IF (GFOUND) CALL PRINT_MSG(NVERB_FATAL,'IO','READ_DESFM_n','use namelist NAM_OUTPUT instead of namelist NAM_FMOUT')
END IF
CALL POSNAM(ILUDES,'NAM_BUDGET',GFOUND)
IF (GFOUND) READ(UNIT=ILUDES,NML=NAM_BUDGET)
diff --git a/src/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90
index aa8939e63..67968617e 100644
--- a/src/MNH/read_exsegn.f90
+++ b/src/MNH/read_exsegn.f90
@@ -296,6 +296,7 @@ USE MODD_PARAMETERS
USE MODD_CONF
USE MODD_CONFZ
USE MODD_CONF_n, ONLY : CSTORAGE_TYPE
+USE MODD_IO_ll, ONLY : NVERB_FATAL
USE MODD_VAR_ll, ONLY: NPROC
!
USE MODN_BUDGET
@@ -305,7 +306,7 @@ USE MODN_CONFZ
USE MODN_FRC
USE MODN_DYN
USE MODN_NESTING
-USE MODN_FMOUT
+USE MODN_OUTPUT
USE MODN_CONF_n
USE MODN_LBC_n ! routine is used for each nested model. This has been done
USE MODN_DYN_n ! to avoid the duplication of this routine for each model.
@@ -346,6 +347,7 @@ USE MODD_GR_FIELD_n
USE MODE_POS
USE MODE_FM
USE MODE_IO_ll
+USE MODE_MSG
!
USE MODI_TEST_NAM_VAR
USE MODI_INI_NSV
@@ -496,7 +498,7 @@ IF (KMI == 1) THEN
IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_DYN)
CALL POSNAM(ILUSEG,'NAM_NESTING',GFOUND,ILUOUT)
IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_NESTING)
- CALL POSNAM(ILUSEG,'NAM_FMOUT',GFOUND,ILUOUT)
+ CALL POSNAM(ILUSEG,'NAM_OUTPUT',GFOUND,ILUOUT)
IF (GFOUND) THEN
!Should have been allocated before in READ_DESFM_n
IF (.NOT.ALLOCATED(XBAK_TIME)) ALLOCATE(XBAK_TIME(NMODEL,JPOUTMAX))
@@ -509,7 +511,10 @@ IF (KMI == 1) THEN
NBAK_STEP(:,:) = NNEGUNDEF
NOUT_STEP(:,:) = NNEGUNDEF
COUT_VAR(:,:) = ''
- READ(UNIT=ILUSEG,NML=NAM_FMOUT)
+ READ(UNIT=ILUSEG,NML=NAM_OUTPUT)
+ ELSE
+ CALL POSNAM(ILUSEG,'NAM_FMOUT',GFOUND)
+ IF (GFOUND) CALL PRINT_MSG(NVERB_FATAL,'IO','READ_EXSEG_n','use namelist NAM_OUTPUT instead of namelist NAM_FMOUT')
END IF
CALL POSNAM(ILUSEG,'NAM_BUDGET',GFOUND,ILUOUT)
IF (GFOUND) READ(UNIT=ILUSEG,NML=NAM_BUDGET)
diff --git a/src/MNH/write_desfmn.f90 b/src/MNH/write_desfmn.f90
index 396d6c81e..c3db884ae 100644
--- a/src/MNH/write_desfmn.f90
+++ b/src/MNH/write_desfmn.f90
@@ -133,7 +133,7 @@ END MODULE MODI_WRITE_DESFM_n
!! Temporary Modification (Masson 06/09/96) manual write of the first and
!! third namelists because of compiler version.
!! Modifications J.-P. Lafore 22/07/96 gridnesting implementation
-!! Modifications J.-P. Lafore 29/07/96 add NAM_FMOUT
+!! Modifications J.-P. Lafore 29/07/96 add NAM_FMOUT (renamed in NAM_OUTPUT)
!! Modifications V. Masson 10/07/97 add NAM_PARAM_GROUNDn
!! Modifications V. Masson 28/07/97 supress LSTEADY_DMASS
!! Modifications P. Jabouille 03/10/01 LHORELAX_ modifications
@@ -156,7 +156,7 @@ USE MODD_DYN_n, ONLY : LHORELAX_SVLIMA
USE MODN_CONF
USE MODN_DYN
USE MODN_NESTING
-USE MODN_FMOUT
+USE MODN_OUTPUT
USE MODN_BUDGET
USE MODN_LES
USE MODN_DYN_n
@@ -368,7 +368,7 @@ END IF
WRITE(UNIT=ILUSEG,NML=NAM_CONF)
WRITE(UNIT=ILUSEG,NML=NAM_DYN)
WRITE(UNIT=ILUSEG,NML=NAM_NESTING)
-!WRITE(UNIT=ILUSEG,NML=NAM_FMOUT)
+!WRITE(UNIT=ILUSEG,NML=NAM_OUTPUT)
IF(CBUTYPE /= 'NONE') THEN
IF(CBUTYPE=='SKIP') CBUTYPE='CART'
WRITE(UNIT=ILUSEG,NML=NAM_BUDGET)
@@ -470,8 +470,8 @@ IF (NVERB >= 5) THEN
WRITE(UNIT=ILUOUT,FMT="(/,'********** NESTING **************************')")
WRITE(UNIT=ILUOUT,NML=NAM_NESTING)
!
-! WRITE(UNIT=ILUOUT,FMT="(/,'********** FMOUT ****************************')")
-! WRITE(UNIT=ILUOUT,NML=NAM_FMOUT)
+! WRITE(UNIT=ILUOUT,FMT="(/,'********** OUTPUT ***************************')")
+! WRITE(UNIT=ILUOUT,NML=NAM_OUTPUT)
!
WRITE(UNIT=ILUOUT,FMT="('************ BUDGET ***************************')")
WRITE(UNIT=ILUOUT,NML=NAM_BUDGET)
--
GitLab