Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LMGC90
LMGC90_user
Commits
5a315ec8
Commit
5a315ec8
authored
May 26, 2015
by
mozul
Browse files
Merge commit '
d5cd31b9
'
keep on preparing src for revision 2015.3
parents
431b02ee
d5cd31b9
Changes
3
Show whitespace changes
Inline
Side-by-side
src/ChiPy/src/shared/wrap_a_EF.f90
View file @
5a315ec8
...
...
@@ -52,10 +52,10 @@ contains
subroutine
InterpolateField
(
field
,
nb_nodes
,
point
,
space_dim
,
res
)
bind
(
c
,
name
=
'a_EF_InterpolateField'
)
implicit
none
real
(
kind
=
c_double
),
dimension
(
nb_nodes
)
::
field
integer
(
kind
=
c_int
),
intent
(
in
),
value
::
nb_nodes
real
(
kind
=
c_double
),
dimension
(
space_dim
)
::
point
real
(
kind
=
c_double
),
dimension
(
nb_nodes
)
::
field
integer
(
kind
=
c_int
),
intent
(
in
),
value
::
space_dim
real
(
kind
=
c_double
),
dimension
(
space_dim
)
::
point
real
(
kind
=
c_double
)
::
res
!
integer
(
kind
=
4
)
::
i
...
...
@@ -67,8 +67,8 @@ contains
subroutine
ComputeCenter
(
coor
,
nb_nodes
,
isize
,
ccenter
,
csize
)
bind
(
c
,
name
=
'a_EF_ComputeCenter'
)
implicit
none
real
(
kind
=
c_double
),
dimension
(
isize
,
nb_nodes
)
::
coor
integer
(
kind
=
c_int
),
intent
(
in
),
value
::
nb_nodes
,
isize
real
(
kind
=
c_double
),
dimension
(
isize
,
nb_nodes
)
::
coor
integer
(
kind
=
c_int
)
::
csize
type
(
c_ptr
)
::
ccenter
!
...
...
src/Core/src/shared/CMakeLists.txt
View file @
5a315ec8
...
...
@@ -110,6 +110,7 @@ add_test( test_rough_detections ${EXECUTABLE_OUTPUT_PATH}/test_rough_detections)
add_test
(
test_a_EF
${
EXECUTABLE_OUTPUT_PATH
}
/test_a_EF
)
set_property
(
TARGET test_paranoid PROPERTY LINKER_LANGUAGE Fortran
)
set_property
(
TARGET test_algebra PROPERTY LINKER_LANGUAGE Fortran
)
set_property
(
TARGET test_a_MATRIX PROPERTY LINKER_LANGUAGE Fortran
)
set_property
(
TARGET test_case_vs_gmatrix PROPERTY LINKER_LANGUAGE Fortran
)
set_property
(
TARGET test_DiscreteGeometry PROPERTY LINKER_LANGUAGE Fortran
)
...
...
src/tools/cmake/modules/set_revision_number.cmake
View file @
5a315ec8
...
...
@@ -7,7 +7,7 @@
# when typing 'make'
if
(
GIT_EXECUTABLE
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
-
C
${
dir
}
rev-parse HEAD
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
-
-git-dir
${
dir
}
/.git --work-tree=
${
dir
}
rev-parse HEAD
OUTPUT_VARIABLE git_revision
OUTPUT_STRIP_TRAILING_WHITESPACE
)
...
...
Write
Preview
Supports
Markdown
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