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
Releases
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
RODIER Quentin
Méso-NH code
Commits
7a581e64
Commit
7a581e64
authored
6 years ago
by
WAUTELET Philippe
Browse files
Options
Downloads
Patches
Plain Diff
Philippe 10/01/2019: IO: write header also for Z-split files
parent
545cb829
No related branches found
No related tags found
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
+22
-4
22 additions, 4 deletions
src/LIB/SURCOUCHE/src/fmwrit_ll.f90
with
22 additions
and
4 deletions
src/LIB/SURCOUCHE/src/fmwrit_ll.f90
+
22
−
4
View file @
7a581e64
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
! 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
! Philippe Wautelet: 10/01/2019: do not write scalars in Z-split files
! Philippe Wautelet: 10/01/2019: write header also for Z-split files
!-----------------------------------------------------------------
!-----------------------------------------------------------------
#ifdef MNH_MPI_DOUBLE_PRECISION
#ifdef MNH_MPI_DOUBLE_PRECISION
...
@@ -159,6 +160,23 @@ CONTAINS
...
@@ -159,6 +160,23 @@ CONTAINS
SUBROUTINE
IO_WRITE_HEADER
(
TPFILE
,
HDAD_NAME
)
SUBROUTINE
IO_WRITE_HEADER
(
TPFILE
,
HDAD_NAME
)
TYPE
(
TFILEDATA
),
INTENT
(
IN
)
::
TPFILE
! File structure
CHARACTER
(
LEN
=*
),
OPTIONAL
,
INTENT
(
IN
)
::
HDAD_NAME
integer
::
ifile
CALL
PRINT_MSG
(
NVERB_DEBUG
,
'IO'
,
'IO_WRITE_HEADER_FILE'
,
'called for file '
//
TRIM
(
TPFILE
%
CNAME
))
CALL
IO_WRITE_HEADER_ONEFILE
(
TPFILE
,
HDAD_NAME
)
!Write header also for the Z-split files
DO
IFILE
=
1
,
TPFILE
%
NSUBFILES_IOZ
CALL
IO_WRITE_HEADER_ONEFILE
(
TPFILE
%
TFILES_IOZ
(
IFILE
)
%
TFILE
,
HDAD_NAME
)
END
DO
END
SUBROUTINE
IO_WRITE_HEADER
SUBROUTINE
IO_WRITE_HEADER_ONEFILE
(
TPFILE
,
HDAD_NAME
)
!
!
USE
MODD_CONF
USE
MODD_CONF
USE
MODD_CONF_n
,
ONLY
:
CSTORAGE_TYPE
USE
MODD_CONF_n
,
ONLY
:
CSTORAGE_TYPE
...
@@ -170,11 +188,11 @@ CONTAINS
...
@@ -170,11 +188,11 @@ CONTAINS
CHARACTER
(
LEN
=
:),
ALLOCATABLE
::
YDAD_NAME
CHARACTER
(
LEN
=
:),
ALLOCATABLE
::
YDAD_NAME
INTEGER
::
ILEN
,
ILEN2
INTEGER
::
ILEN
,
ILEN2
!
!
CALL
PRINT_MSG
(
NVERB_DEBUG
,
'IO'
,
'IO_WRITE_HEADER'
,
'called for file '
//
TRIM
(
TPFILE
%
CNAME
))
CALL
PRINT_MSG
(
NVERB_DEBUG
,
'IO'
,
'IO_WRITE_HEADER
_ONEFILE
'
,
'called for file '
//
TRIM
(
TPFILE
%
CNAME
))
!
!
IF
(
ASSOCIATED
(
TPFILE
%
TDADFILE
)
.AND.
PRESENT
(
HDAD_NAME
)
)
THEN
IF
(
ASSOCIATED
(
TPFILE
%
TDADFILE
)
.AND.
PRESENT
(
HDAD_NAME
)
)
THEN
IF
(
TRIM
(
TPFILE
%
TDADFILE
%
CNAME
)
/
=
TRIM
(
HDAD_NAME
)
)
THEN
IF
(
TRIM
(
TPFILE
%
TDADFILE
%
CNAME
)
/
=
TRIM
(
HDAD_NAME
)
)
THEN
CALL
PRINT_MSG
(
NVERB_ERROR
,
'IO'
,
'IO_WRITE_HEADER'
,
'TPFILE%TDADFILE%CNAME /= HDAD_NAME'
)
CALL
PRINT_MSG
(
NVERB_ERROR
,
'IO'
,
'IO_WRITE_HEADER
_ONEFILE
'
,
'TPFILE%TDADFILE%CNAME /= HDAD_NAME'
)
END
IF
END
IF
END
IF
END
IF
!
!
...
@@ -209,7 +227,7 @@ CONTAINS
...
@@ -209,7 +227,7 @@ CONTAINS
YDAD_NAME
(:)
=
' '
YDAD_NAME
(:)
=
' '
END
IF
END
IF
ELSE
ELSE
CALL
PRINT_MSG
(
NVERB_DEBUG
,
'IO'
,
'IO_WRITE_HEADER'
,
TRIM
(
TPFILE
%
CNAME
)//
&
CALL
PRINT_MSG
(
NVERB_DEBUG
,
'IO'
,
'IO_WRITE_HEADER
_ONEFILE
'
,
TRIM
(
TPFILE
%
CNAME
)//
&
': TPFILE%TDADFILE not associated and HDAD_NAME not provided'
)
': TPFILE%TDADFILE not associated and HDAD_NAME not provided'
)
ALLOCATE
(
CHARACTER
(
LEN
=
NFILENAMELGTMAXLFI
)
::
YDAD_NAME
)
ALLOCATE
(
CHARACTER
(
LEN
=
NFILENAMELGTMAXLFI
)
::
YDAD_NAME
)
YDAD_NAME
(:)
=
' '
YDAD_NAME
(:)
=
' '
...
@@ -217,7 +235,7 @@ CONTAINS
...
@@ -217,7 +235,7 @@ CONTAINS
CALL
IO_WRITE_FIELD
(
TPFILE
,
'DAD_NAME'
,
YDAD_NAME
)
CALL
IO_WRITE_FIELD
(
TPFILE
,
'DAD_NAME'
,
YDAD_NAME
)
DEALLOCATE
(
YDAD_NAME
)
DEALLOCATE
(
YDAD_NAME
)
!
!
END
SUBROUTINE
IO_WRITE_HEADER
END
SUBROUTINE
IO_WRITE_HEADER
_ONEFILE
SUBROUTINE
IO_WRITE_FIELD_BYNAME_X0
(
TPFILE
,
HNAME
,
PFIELD
,
KRESP
)
SUBROUTINE
IO_WRITE_FIELD_BYNAME_X0
(
TPFILE
,
HNAME
,
PFIELD
,
KRESP
)
...
...
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