Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
id2
geoperil
easyWave
Commits
28eaf07f
Commit
28eaf07f
authored
Sep 02, 2015
by
Johannes Spazier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for OpenMP within the build system.
parent
ffe10ed6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
code/trunk/configure.ac
code/trunk/configure.ac
+4
-0
code/trunk/src/Makefile.am
code/trunk/src/Makefile.am
+2
-2
code/trunk/src/ewStep.cpp
code/trunk/src/ewStep.cpp
+3
-3
No files found.
code/trunk/configure.ac
View file @
28eaf07f
...
...
@@ -37,4 +37,8 @@ AC_MSG_NOTICE($cuda)
AC_PREFIX_DEFAULT([/usr/local/easywave])
AC_OPENMP
AC_SUBST(AM_CXXFLAGS,"$AM_CXXFLAGS $OPENMP_CXXFLAGS")
AC_OUTPUT
code/trunk/src/Makefile.am
View file @
28eaf07f
...
...
@@ -35,8 +35,8 @@ easywave_SOURCES += ewCudaKernels.cu \
ewGpuNode.cuh
\
EasyWaveGen.cu
easywave_LINK
=
$(NVCC)
-O2
-o
easywave
easywave_LINK
=
$(NVCC)
-O2
-Xcompiler
"
$(OPENMP_CXXFLAGS)
"
-o
easywave
else
easywave_SOURCES
+=
EasyWave.cpp
easywave_LINK
=
$(CXX)
$(CXXFLAGS)
-o
easywave
easywave_LINK
=
$(CXX)
$(CXXFLAGS)
$(OPENMP_CXXFLAGS)
-o
easywave
endif
code/trunk/src/ewStep.cpp
View file @
28eaf07f
...
...
@@ -210,7 +210,7 @@ int ewStepCor( void )
CNode
&
Node
=
*
gNode
;
// sea floor topography (mass conservation)
#pragma omp parallel for default(shared) private(i,j,
nod,
absH)
#pragma omp parallel for default(shared) private(i,j,absH)
for
(
i
=
Imin
;
i
<=
Imax
;
i
++
)
{
for
(
j
=
Jmin
;
j
<=
Jmax
;
j
++
)
{
...
...
@@ -279,7 +279,7 @@ int ewStepCor( void )
// moment conservation
// longitudial flux update
#pragma omp parallel for default(shared) private(i,j,
nod,
v1,v2)
#pragma omp parallel for default(shared) private(i,j,v1,v2)
for
(
i
=
Imin
;
i
<=
Imax
;
i
++
)
{
for
(
j
=
Jmin
;
j
<=
Jmax
;
j
++
)
{
...
...
@@ -313,7 +313,7 @@ int ewStepCor( void )
}
// lattitudial flux update
#pragma omp parallel for default(shared) private(i,j,
nod,
v1,v2)
#pragma omp parallel for default(shared) private(i,j,v1,v2)
for
(
i
=
Imin
;
i
<=
Imax
;
i
++
)
{
for
(
j
=
Jmin
;
j
<=
Jmax
;
j
++
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment