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
0d6c333c
Commit
0d6c333c
authored
6 years ago
by
WAUTELET Philippe
Browse files
Options
Downloads
Patches
Plain Diff
Philippe 01/03/2019: minor: rename ISIOP -> NIO_RANK
parent
ee2805f3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/LIB/SURCOUCHE/src/modd_io.f90
+1
-1
1 addition, 1 deletion
src/LIB/SURCOUCHE/src/modd_io.f90
src/LIB/SURCOUCHE/src/mode_io.f90
+2
-2
2 additions, 2 deletions
src/LIB/SURCOUCHE/src/mode_io.f90
src/LIB/SURCOUCHE/src/mode_io_file.f90
+7
-7
7 additions, 7 deletions
src/LIB/SURCOUCHE/src/mode_io_file.f90
with
10 additions
and
10 deletions
src/LIB/SURCOUCHE/src/modd_io.f90
+
1
−
1
View file @
0d6c333c
...
...
@@ -23,7 +23,7 @@ INTEGER, PARAMETER :: NVERB_NO=0, NVERB_FATAL=1, NVERB_ERROR=2, NVERB_WARNING=3,
INTEGER
::
NNULLUNIT
=
-1
! /dev/null fortran unit, value set in INITIO_ll
CHARACTER
(
LEN
=*
),
PARAMETER
::
CNULLFILE
=
"/dev/null"
INTEGER
,
SAVE
::
ISIOP
!!
IOproc
number
INTEGER
,
SAVE
::
NIO_RANK
! Rank of
IO
proc
ess
INTEGER
,
SAVE
::
ISP
!! Actual proc number
INTEGER
,
SAVE
::
ISNPROC
!! Total number of allocated processes
LOGICAL
,
SAVE
::
GSMONOPROC
=
.FALSE.
!! True if sequential execution (ISNPROC = 1)
...
...
This diff is collapsed.
Click to expand it.
src/LIB/SURCOUCHE/src/mode_io.f90
+
2
−
2
View file @
0d6c333c
...
...
@@ -71,7 +71,7 @@ CONTAINS
END
SUBROUTINE
SET_CONFIO_INTERN_ll
SUBROUTINE
INITIO_ll
()
USE
MODD_IO_ll
,
only
:
CNULLFILE
,
GSMONOPROC
,
ISIOP
,
ISNPROC
,
ISP
,
NNULLUNIT
USE
MODD_IO_ll
,
only
:
CNULLFILE
,
GSMONOPROC
,
nio_rank
,
ISNPROC
,
ISP
,
NNULLUNIT
USE
MODE_MNH_WORLD
,
ONLY
:
INIT_NMNH_COMM_WORLD
...
...
@@ -88,7 +88,7 @@ CONTAINS
!! Now MPI is initialized for sure
!! Default number for Processor I/O
ISIOP
=
1
nio_rank
=
1
!! Get number of allocated processors
CALL
MPI_COMM_SIZE
(
NMNH_COMM_WORLD
,
ISNPROC
,
IERR
)
...
...
This diff is collapsed.
Click to expand it.
src/LIB/SURCOUCHE/src/mode_io_file.f90
+
7
−
7
View file @
0d6c333c
...
...
@@ -180,7 +180,7 @@ END SUBROUTINE IO_File_open
SUBROUTINE
OPEN_ll
(
TPFILE
,
KRESP
,
HMODE
,
HSTATUS
,
HPOSITION
,
HDELIM
,
HPROGRAM_ORIG
)
use
modd_io_ll
,
only
:
ISNPROC
,
ISP
,
LVERB_ALLPRC
,
ISIOP
,
NNULLUNIT
use
modd_io_ll
,
only
:
ISNPROC
,
ISP
,
LVERB_ALLPRC
,
nio_rank
,
NNULLUNIT
use
modd_var_ll
,
only
:
nmnh_comm_world
#if defined(MNH_IOCDF4)
...
...
@@ -290,13 +290,13 @@ SUBROUTINE OPEN_ll(TPFILE, KRESP, HMODE, HSTATUS, HPOSITION, HDELIM, HPROGRAM_OR
TPFILE
%
LMASTER
=
.TRUE.
!Every process may write in the file
TPFILE
%
LMULTIMASTERS
=
.TRUE.
ELSE
TPFILE
%
NMASTER_RANK
=
ISIOP
TPFILE
%
LMASTER
=
(
ISP
==
ISIOP
)
TPFILE
%
NMASTER_RANK
=
nio_rank
TPFILE
%
LMASTER
=
(
ISP
==
nio_rank
)
TPFILE
%
LMULTIMASTERS
=
.FALSE.
END
IF
ELSE
TPFILE
%
NMASTER_RANK
=
ISIOP
TPFILE
%
LMASTER
=
(
ISP
==
ISIOP
)
TPFILE
%
NMASTER_RANK
=
nio_rank
TPFILE
%
LMASTER
=
(
ISP
==
nio_rank
)
TPFILE
%
LMULTIMASTERS
=
.FALSE.
END
IF
END
IF
...
...
@@ -422,8 +422,8 @@ SUBROUTINE OPEN_ll(TPFILE, KRESP, HMODE, HSTATUS, HPOSITION, HDELIM, HPROGRAM_OR
CASE
(
'IO_ZSPLIT'
)
TPFILE
%
NMASTER_RANK
=
ISIOP
TPFILE
%
LMASTER
=
(
ISP
==
ISIOP
)
TPFILE
%
NMASTER_RANK
=
nio_rank
TPFILE
%
LMASTER
=
(
ISP
==
nio_rank
)
TPFILE
%
LMULTIMASTERS
=
.FALSE.
IF
(
TPFILE
%
NSUBFILES_IOZ
>
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