Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Méso-NH code
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VIE Benoît
Méso-NH code
Commits
545cb829
Commit
545cb829
authored
6 years ago
by
WAUTELET Philippe
Browse files
Options
Downloads
Patches
Plain Diff
Philippe 10/01/2019: IO: do not write scalars in Z-split files
parent
a593a050
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/LIB/SURCOUCHE/src/fmwrit_ll.f90
+10
-1
10 additions, 1 deletion
src/LIB/SURCOUCHE/src/fmwrit_ll.f90
with
10 additions
and
1 deletion
src/LIB/SURCOUCHE/src/fmwrit_ll.f90
+
10
−
1
View file @
545cb829
!MNH_LIC Copyright 1994-201
8
CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC Copyright 1994-201
9
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.
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
! Modifications:
! Modifications:
! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
! Philippe Wautelet: 10/01/2019: do not write scalars in Z-split files
!-----------------------------------------------------------------
!-----------------------------------------------------------------
#ifdef MNH_MPI_DOUBLE_PRECISION
#ifdef MNH_MPI_DOUBLE_PRECISION
...
@@ -14,6 +15,8 @@
...
@@ -14,6 +15,8 @@
#define MPI_FLOAT MPI_REAL
#define MPI_FLOAT MPI_REAL
#endif
#endif
#define MNH_SCALARS_IN_SPLITFILES 0
MODULE
MODE_FMWRIT
MODULE
MODE_FMWRIT
USE
MODD_MPIF
USE
MODD_MPIF
...
@@ -297,6 +300,7 @@ CONTAINS
...
@@ -297,6 +300,7 @@ CONTAINS
!
!
CALL
MPI_BCAST
(
IRESP
,
1
,
MPI_INTEGER
,
TPFILE
%
NMASTER_RANK
-1
,
TPFILE
%
NMPICOMM
,
IERR
)
CALL
MPI_BCAST
(
IRESP
,
1
,
MPI_INTEGER
,
TPFILE
%
NMASTER_RANK
-1
,
TPFILE
%
NMPICOMM
,
IERR
)
END
IF
! multiprocesses execution
END
IF
! multiprocesses execution
#if MNH_SCALARS_IN_SPLITFILES
IF
(
TPFILE
%
NSUBFILES_IOZ
>
0
)
THEN
IF
(
TPFILE
%
NSUBFILES_IOZ
>
0
)
THEN
! write the data in all Z files
! write the data in all Z files
DO
IK_FILE
=
1
,
TPFILE
%
NSUBFILES_IOZ
DO
IK_FILE
=
1
,
TPFILE
%
NSUBFILES_IOZ
...
@@ -307,6 +311,7 @@ CONTAINS
...
@@ -307,6 +311,7 @@ CONTAINS
END
IF
END
IF
END
DO
END
DO
ENDIF
ENDIF
#endif
END
IF
END
IF
!
!
IF
(
IRESP
.NE.
0
)
THEN
IF
(
IRESP
.NE.
0
)
THEN
...
@@ -1444,6 +1449,7 @@ CONTAINS
...
@@ -1444,6 +1449,7 @@ CONTAINS
!
!
CALL
MPI_BCAST
(
IRESP
,
1
,
MPI_INTEGER
,
TPFILE
%
NMASTER_RANK
-1
,
TPFILE
%
NMPICOMM
,
IERR
)
CALL
MPI_BCAST
(
IRESP
,
1
,
MPI_INTEGER
,
TPFILE
%
NMASTER_RANK
-1
,
TPFILE
%
NMPICOMM
,
IERR
)
END
IF
! multiprocess execution
END
IF
! multiprocess execution
#if MNH_SCALARS_IN_SPLITFILES
IF
(
TPFILE
%
NSUBFILES_IOZ
>
0
)
THEN
IF
(
TPFILE
%
NSUBFILES_IOZ
>
0
)
THEN
! write the data in all Z files
! write the data in all Z files
DO
IK_FILE
=
1
,
TPFILE
%
NSUBFILES_IOZ
DO
IK_FILE
=
1
,
TPFILE
%
NSUBFILES_IOZ
...
@@ -1454,6 +1460,7 @@ CONTAINS
...
@@ -1454,6 +1460,7 @@ CONTAINS
END
IF
END
IF
END
DO
END
DO
ENDIF
ENDIF
#endif
END
IF
END
IF
!
!
IF
(
IRESP
.NE.
0
)
THEN
IF
(
IRESP
.NE.
0
)
THEN
...
@@ -1951,6 +1958,7 @@ CONTAINS
...
@@ -1951,6 +1958,7 @@ CONTAINS
!
!
CALL
MPI_BCAST
(
IRESP
,
1
,
MPI_INTEGER
,
TPFILE
%
NMASTER_RANK
-1
,
TPFILE
%
NMPICOMM
,
IERR
)
CALL
MPI_BCAST
(
IRESP
,
1
,
MPI_INTEGER
,
TPFILE
%
NMASTER_RANK
-1
,
TPFILE
%
NMPICOMM
,
IERR
)
END
IF
! multiprocesses execution
END
IF
! multiprocesses execution
#if MNH_SCALARS_IN_SPLITFILES
IF
(
TPFILE
%
NSUBFILES_IOZ
>
0
)
THEN
IF
(
TPFILE
%
NSUBFILES_IOZ
>
0
)
THEN
! write the data in all Z files
! write the data in all Z files
DO
IK_FILE
=
1
,
TPFILE
%
NSUBFILES_IOZ
DO
IK_FILE
=
1
,
TPFILE
%
NSUBFILES_IOZ
...
@@ -1961,6 +1969,7 @@ CONTAINS
...
@@ -1961,6 +1969,7 @@ CONTAINS
END
IF
END
IF
END
DO
END
DO
ENDIF
ENDIF
#endif
END
IF
END
IF
!
!
IF
(
IRESP
.NE.
0
)
THEN
IF
(
IRESP
.NE.
0
)
THEN
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment