Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
Detection eddies
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container 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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IPSL
LMD
DPAO
Detection eddies
Commits
b740c192
Commit
b740c192
authored
3 years ago
by
Lionel GUEZ
Browse files
Options
Downloads
Patches
Plain Diff
Rename variable `shp_tr_dir` to `shpc_dir`
parent
83123e30
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Overlap/Tests/test_read_snapshot.f90
+4
-5
4 additions, 5 deletions
Overlap/Tests/test_read_snapshot.f90
Overlap/Tests/test_send_recv.f90
+5
-6
5 additions, 6 deletions
Overlap/Tests/test_send_recv.f90
with
9 additions
and
11 deletions
Overlap/Tests/test_read_snapshot.f90
+
4
−
5
View file @
b740c192
...
...
@@ -16,7 +16,7 @@ program test_read_snapshot
implicit
none
character
(
len
=
:),
allocatable
::
shp
_tr
_dir
character
(
len
=
:),
allocatable
::
shp
c
_dir
type
(
snapshot
)
s
TYPE
(
shp_tr
)
hshp
integer
k1
,
copy
,
unit
...
...
@@ -42,8 +42,7 @@ program test_read_snapshot
!-------------------------------------------------------------------------
call
mpi_init
call
get_command_arg_dyn
(
1
,
shp_tr_dir
,
&
"Required argument: SHP-triplet-directory"
)
call
get_command_arg_dyn
(
1
,
shpc_dir
,
"Required argument: SHPC-directory"
)
write
(
unit
=
error_unit
,
nml
=
main_nml
)
write
(
unit
=
error_unit
,
fmt
=
*
)
"Enter namelist main_nml."
...
...
@@ -51,7 +50,7 @@ program test_read_snapshot
write
(
unit
=
*
,
nml
=
main_nml
)
call
new_unit
(
unit
)
open
(
unit
,
file
=
shp
_tr
_dir
//
"/grid_nml.txt"
,
status
=
"old"
,
&
open
(
unit
,
file
=
shp
c
_dir
//
"/grid_nml.txt"
,
status
=
"old"
,
&
action
=
"read"
,
position
=
"rewind"
)
read
(
unit
,
nml
=
grid_nml
)
close
(
unit
)
...
...
@@ -64,7 +63,7 @@ program test_read_snapshot
"test_read_snapshot dist_lim"
)
copy
=
merge
(
dist_lim
,
0
,
periodic
)
call
shp_tr_open
(
hshp
,
trim
(
shp
_tr
_dir
),
rank
=
0
)
call
shp_tr_open
(
hshp
,
trim
(
shp
c
_dir
),
rank
=
0
)
call
dbf_read_attribute_03
(
k1
,
hshp
%
extremum
,
hshp
%
extr_date
,
ishape
=
0
)
call
read_snapshot
(
s
,
k1
,
hshp
,
corner_deg
*
deg_to_rad
,
&
step_deg
*
deg_to_rad
,
nlon
,
nlat
,
copy
,
k1
,
ishape_last
=
[
3
])
...
...
This diff is collapsed.
Click to expand it.
Overlap/Tests/test_send_recv.f90
+
5
−
6
View file @
b740c192
...
...
@@ -22,7 +22,7 @@ program test_send_recv
implicit
none
character
(
len
=
:),
allocatable
::
shp
_tr
_dir
character
(
len
=
:),
allocatable
::
shp
c
_dir
type
(
snapshot
)
s
integer
rank
,
n_proc
,
k1
,
copy
,
n_dates
,
unit
logical
flag
...
...
@@ -58,8 +58,7 @@ program test_send_recv
call
mpi_abort
(
MPI_Comm_world
,
errorcode
=
1
)
end
if
call
get_command_arg_dyn
(
1
,
shp_tr_dir
,
&
"Required argument: SHP-triplet-directory"
)
call
get_command_arg_dyn
(
1
,
shpc_dir
,
"Required argument: SHPC-directory"
)
if
(
rank
==
0
)
then
call
MPI_Comm_get_attr
(
MPI_Comm_world
,
MPI_io
,
attribute_val
,
flag
)
...
...
@@ -73,7 +72,7 @@ program test_send_recv
write
(
unit
=
*
,
nml
=
main_nml
)
call
new_unit
(
unit
)
open
(
unit
,
file
=
shp
_tr
_dir
//
"/grid_nml.txt"
,
status
=
"old"
,
&
open
(
unit
,
file
=
shp
c
_dir
//
"/grid_nml.txt"
,
status
=
"old"
,
&
action
=
"read"
,
position
=
"rewind"
)
read
(
unit
,
nml
=
grid_nml
)
close
(
unit
)
...
...
@@ -86,7 +85,7 @@ program test_send_recv
"test_send_recv dist_lim"
)
copy
=
merge
(
dist_lim
,
0
,
periodic
)
call
read_column
(
ishape_last
,
&
file
=
trim
(
shp
_tr
_dir
)
//
"/ishape_last.txt"
)
file
=
trim
(
shp
c
_dir
)
//
"/ishape_last.txt"
)
n_dates
=
size
(
ishape_last
)
end
if
...
...
@@ -99,7 +98,7 @@ program test_send_recv
if
(
rank
==
1
)
allocate
(
ishape_last
(
n_dates
))
call
ezmpi_bcast
(
ishape_last
,
root
=
0
)
call
shp_tr_open
(
hshp
,
trim
(
shp
_tr
_dir
),
rank
)
call
shp_tr_open
(
hshp
,
trim
(
shp
c
_dir
),
rank
)
if
(
rank
==
0
)
call
dbf_read_attribute_03
(
k1
,
hshp
%
extremum
,
hshp
%
extr_date
,
&
ishape
=
0
)
call
ezmpi_bcast
(
k1
,
root
=
0
)
...
...
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