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
d4b36dc1
Commit
d4b36dc1
authored
3 years ago
by
Lionel GUEZ
Browse files
Options
Downloads
Patches
Plain Diff
Remove MPI from program `test_read_eddy`
Thanks to commit
5ff9e1d2
, we are reverting in part commits
e1aa5bcc
and
338dd393
.
parent
f479faee
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Overlap/Tests/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Overlap/Tests/CMakeLists.txt
Overlap/Tests/short_tests.json
+0
-4
0 additions, 4 deletions
Overlap/Tests/short_tests.json
Overlap/Tests/test_read_eddy.f90
+1
-15
1 addition, 15 deletions
Overlap/Tests/test_read_eddy.f90
with
2 additions
and
20 deletions
Overlap/Tests/CMakeLists.txt
+
1
−
1
View file @
d4b36dc1
...
...
@@ -72,7 +72,7 @@ add_executable(test_read_eddy
${
PROJECT_SOURCE_DIR
}
/Common/shpc_close.f90
)
target_link_libraries
(
test_read_eddy shapelib_03 contour_531 gpc_f
ezmpi
nr_util
MPI::MPI_Fortran
jumble
)
nr_util jumble
)
target_include_directories
(
test_read_eddy PRIVATE
${
fortrangis_INCLUDE_DIR
}
)
...
...
This diff is collapsed.
Click to expand it.
Overlap/Tests/short_tests.json
+
0
−
4
View file @
d4b36dc1
...
...
@@ -26,16 +26,12 @@
"SHPC_old"
]
],
"stdout"
:
"test_read_eddy_stdout.txt"
,
"commands"
:
[
[
"mkdir"
,
"SHPC"
],
[
"$mpiexec"
,
"-n"
,
"1"
,
"$build_dir/Overlap/test_read_eddy"
]
]
...
...
This diff is collapsed.
Click to expand it.
Overlap/Tests/test_read_eddy.f90
+
1
−
15
View file @
d4b36dc1
program
test_read_eddy
! Libraries:
use
mpi_f08
,
only
:
mpi_init
,
mpi_finalize
,
MPI_Comm_rank
,
MPI_Comm_world
,
&
MPI_Comm_size
,
mpi_abort
use
derived_types
,
only
:
eddy
,
shpc
use
read_eddy_m
,
only
:
read_eddy
use
shpc_close_m
,
only
:
shpc_close
...
...
@@ -14,20 +10,11 @@ program test_read_eddy
implicit
none
type
(
eddy
)
e
integer
k
,
i
,
rank
,
n_proc
integer
k
,
i
TYPE
(
shpc
)
hshp
!-------------------------------------------------------------------------
call
mpi_init
call
MPI_Comm_rank
(
MPI_Comm_world
,
rank
)
call
mpi_comm_size
(
mpi_comm_world
,
n_proc
)
if
(
n_proc
/
=
1
)
then
if
(
rank
==
0
)
print
*
,
"test_read_eddy: 1 process only"
call
mpi_abort
(
MPI_Comm_world
,
errorcode
=
1
)
end
if
call
shpc_open
(
hshp
,
"SHPC_old"
,
rank
=
0
)
call
read_eddy
(
e
,
k
,
i
,
hshp
,
ishape
=
0
)
CALL
shpc_close
(
hshp
)
...
...
@@ -36,6 +23,5 @@ program test_read_eddy
call
write_eddy
(
e
,
hshp
,
k
,
i
)
CALL
shpc_close
(
hshp
)
print
*
,
'Created shapefiles in SHPC.'
call
mpi_finalize
end
program
test_read_eddy
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