Commit 5a315ec8 authored by mozul's avatar mozul
Browse files

Merge commit 'd5cd31b9'

keep on preparing src for revision 2015.3
parents 431b02ee d5cd31b9
...@@ -52,10 +52,10 @@ contains ...@@ -52,10 +52,10 @@ contains
subroutine InterpolateField(field,nb_nodes,point,space_dim,res) bind(c, name='a_EF_InterpolateField') subroutine InterpolateField(field,nb_nodes,point,space_dim,res) bind(c, name='a_EF_InterpolateField')
implicit none implicit none
real(kind=c_double), dimension(nb_nodes) :: field
integer(kind=c_int), intent(in), value :: nb_nodes 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 integer(kind=c_int), intent(in), value :: space_dim
real(kind=c_double), dimension(space_dim) :: point
real(kind=c_double) :: res real(kind=c_double) :: res
! !
integer(kind=4) :: i integer(kind=4) :: i
...@@ -67,8 +67,8 @@ contains ...@@ -67,8 +67,8 @@ contains
subroutine ComputeCenter(coor,nb_nodes,isize,ccenter,csize) bind(c, name='a_EF_ComputeCenter') subroutine ComputeCenter(coor,nb_nodes,isize,ccenter,csize) bind(c, name='a_EF_ComputeCenter')
implicit none implicit none
real(kind=c_double), dimension(isize,nb_nodes) :: coor
integer(kind=c_int), intent(in), value :: nb_nodes, isize integer(kind=c_int), intent(in), value :: nb_nodes, isize
real(kind=c_double), dimension(isize,nb_nodes) :: coor
integer(kind=c_int) :: csize integer(kind=c_int) :: csize
type(c_ptr) :: ccenter type(c_ptr) :: ccenter
! !
......
...@@ -110,6 +110,7 @@ add_test( test_rough_detections ${EXECUTABLE_OUTPUT_PATH}/test_rough_detections) ...@@ -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) add_test( test_a_EF ${EXECUTABLE_OUTPUT_PATH}/test_a_EF)
set_property(TARGET test_paranoid PROPERTY LINKER_LANGUAGE Fortran) 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_a_MATRIX PROPERTY LINKER_LANGUAGE Fortran)
set_property(TARGET test_case_vs_gmatrix PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET test_case_vs_gmatrix PROPERTY LINKER_LANGUAGE Fortran)
set_property(TARGET test_DiscreteGeometry PROPERTY LINKER_LANGUAGE Fortran) set_property(TARGET test_DiscreteGeometry PROPERTY LINKER_LANGUAGE Fortran)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# when typing 'make' # when typing 'make'
if(GIT_EXECUTABLE) 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_VARIABLE git_revision
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment