Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NP_TMcode
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Giacomo Mulas
NP_TMcode
Commits
4c68446e
Commit
4c68446e
authored
1 year ago
by
Giovanni La Mura
Browse files
Options
Downloads
Patches
Plain Diff
Protect MPI-dependent closing brace with MPI pre-compiler directive
parent
45495e78
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/cluster/cluster.cpp
+715
-713
715 additions, 713 deletions
src/cluster/cluster.cpp
with
715 additions
and
713 deletions
src/cluster/cluster.cpp
+
715
−
713
View file @
4c68446e
...
@@ -482,7 +482,7 @@ void cluster(const string& config_file, const string& data_file, const string& o
...
@@ -482,7 +482,7 @@ void cluster(const string& config_file, const string& data_file, const string& o
#endif
#endif
#pragma omp barrier
#pragma omp barrier
}
// close strided loop running on MPI processes
}
// close strided loop running on MPI processes
, ixi488 loop
// delete the shared arrays I used to make available to thread 0 the virtual files of other threads
// delete the shared arrays I used to make available to thread 0 the virtual files of other threads
#pragma omp barrier
#pragma omp barrier
if
(
myompthread
==
0
)
{
if
(
myompthread
==
0
)
{
...
@@ -633,7 +633,9 @@ void cluster(const string& config_file, const string& data_file, const string& o
...
@@ -633,7 +633,9 @@ void cluster(const string& config_file, const string& data_file, const string& o
fclose
(
timing_file
);
fclose
(
timing_file
);
delete
time_logger
;
delete
time_logger
;
delete
logger
;
delete
logger
;
#ifdef MPI_VERSION
}
}
#endif
}
}
int
cluster_jxi488_cycle
(
int
jxi488
,
ScattererConfiguration
*
sconf
,
GeometryConfiguration
*
gconf
,
ScatteringAngles
*
sa
,
ClusterIterationData
*
cid
,
VirtualAsciiFile
*
output
,
const
string
&
output_path
,
VirtualBinaryFile
*
vtppoanp
)
int
cluster_jxi488_cycle
(
int
jxi488
,
ScattererConfiguration
*
sconf
,
GeometryConfiguration
*
gconf
,
ScatteringAngles
*
sa
,
ClusterIterationData
*
cid
,
VirtualAsciiFile
*
output
,
const
string
&
output_path
,
VirtualBinaryFile
*
vtppoanp
)
...
...
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