Commit 677f7820 authored by Wenzhe Yu's avatar Wenzhe Yu 😎
Browse files

Fix compilation without F08 features

parent 2b2bb0d2
......@@ -80,8 +80,8 @@
#include "../general/precision_kinds.F90"
class(elpa_abstract_impl_t), intent(inout) :: obj
real(kind=rk) :: g_col(nlen), l_col(*) ! chnage this to proper 2d 1d matching ! remove assumed size
integer(kind=ik) :: noff, nlen, my_prow, np_rows, nblk
real(kind=rk) :: g_col(nlen), l_col(*) ! chnage this to proper 2d 1d matching ! remove assumed size
integer(kind=ik) :: nbs, nbe, jb, g_off, l_off, js, je
......
......@@ -31,6 +31,13 @@ module elpa_autotune_impl
#else
integer, intent(out) :: error
#endif
! nothing to do atm
#ifdef USE_FORTRAN2008
if (present(error)) error = ELPA_OK
#else
error = ELPA_OK
#endif
end subroutine
!> \brief function to destroy an elpa autotune object
......
......@@ -212,7 +212,7 @@
call self%get("solver", solver,error2)
call self%set("is_skewsymmetric",1)
call self%set("is_skewsymmetric",1,error2)
if (error2 .ne. ELPA_OK) then
print *,"Problem setting is_skewsymmetric. Aborting..."
#ifdef USE_FORTRAN2008
......@@ -503,7 +503,7 @@
logical :: success_l
call self%get("solver", solver,error2)
call self%set("is_skewsymmetric",1)
call self%set("is_skewsymmetric",1,error2)
if (error2 .ne. ELPA_OK) then
print *,"Problem getting solver option. Aborting..."
#ifdef USE_FORTRAN2008
......
......@@ -575,9 +575,9 @@ program test
assert_elpa_ok(error_elpa)
if (layout .eq. 'C') then
call e%set("matrix_order",COLUMN_MAJOR_ORDER)
call e%set("matrix_order",COLUMN_MAJOR_ORDER,error_elpa)
else
call e%set("matrix_order",ROW_MAJOR_ORDER)
call e%set("matrix_order",ROW_MAJOR_ORDER,error_elpa)
endif
#ifdef WITH_MPI
......
......@@ -210,9 +210,9 @@ program test
assert_elpa_ok(error_elpa)
if (layout .eq. 'C') then
call e%set("matrix_order",COLUMN_MAJOR_ORDER)
call e%set("matrix_order",COLUMN_MAJOR_ORDER,error_elpa)
else
call e%set("matrix_order",ROW_MAJOR_ORDER)
call e%set("matrix_order",ROW_MAJOR_ORDER,error_elpa)
endif
#ifdef WITH_MPI
......
......@@ -227,13 +227,13 @@ program test
as_complex(1:na_rows,1:na_cols) = a_complex(1:na_rows,1:na_cols)
! first set up and solve the brute force problem
e_complex => elpa_allocate()
e_complex => elpa_allocate(error_elpa)
call set_basic_params(e_complex, na, nev, na_rows, na_cols, my_prow, my_pcol)
call e_complex%set("timings",1, error_elpa)
call e_complex%set("debug",1)
call e_complex%set("gpu", 0)
call e_complex%set("debug",1,error_elpa)
call e_complex%set("gpu", 0,error_elpa)
call e_complex%set("omp_threads", 8, error_elpa)
assert_elpa_ok(e_complex%setup())
......@@ -265,13 +265,13 @@ program test
call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
#endif
! now run the skewsymmetric case
e_skewsymmetric => elpa_allocate()
e_skewsymmetric => elpa_allocate(error_elpa)
call set_basic_params(e_skewsymmetric, na, nev, na_rows, na_cols, my_prow, my_pcol)
call e_skewsymmetric%set("timings",1, error_elpa)
call e_skewsymmetric%set("debug",1)
call e_skewsymmetric%set("gpu", 0)
call e_skewsymmetric%set("debug",1,error_elpa)
call e_skewsymmetric%set("gpu", 0,error_elpa)
call e_skewsymmetric%set("omp_threads",8, error_elpa)
assert_elpa_ok(e_skewsymmetric%setup())
......@@ -331,8 +331,8 @@ program test
#ifdef WITH_MPI
call MPI_BARRIER(MPI_COMM_WORLD, mpierr)
#endif
call elpa_deallocate(e_complex)
call elpa_deallocate(e_skewsymmetric)
call elpa_deallocate(e_complex,error_elpa)
call elpa_deallocate(e_skewsymmetric,error_elpa)
!to do
......@@ -348,7 +348,7 @@ program test
deallocate(as_skewsymmetric)
deallocate(z_skewsymmetric)
deallocate(ev_skewsymmetric)
call elpa_uninit()
call elpa_uninit(error_elpa)
......
Markdown is supported
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