From eb7ab85ee58c01a0c89c2378012409c39c2eeecd Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 2 Aug 2018 16:26:31 -0500 Subject: [PATCH 1/2] RK+Fortran test: Check that result pointer is allocated before printing --- test/test_rk.f90 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/test_rk.f90 b/test/test_rk.f90 index 61cc4a2..80fc192 100644 --- a/test/test_rk.f90 +++ b/test/test_rk.f90 @@ -46,7 +46,9 @@ program test_rkmethod do istep = 1,ntrips(irun) call timestep_run(dagrt_state=state_ptr) - write(*,*) state%ret_state_y + if (associated(state%ret_state_y)) then + write(*,*) state%ret_state_y + endif enddo true_sol = initial_condition * exp(-2*state%ret_time_y) -- GitLab From 0d8aa605af403397fb804990e5f795b5fbe4c8e7 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 2 Aug 2018 16:27:31 -0500 Subject: [PATCH 2/2] Move Fortran compilation for tests back to newest gfortran --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17e9fba..863fb61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ Python 2.6: script: - py_version=2.6 - EXTRA_INSTALL="numpy scipy" - - export FC=gfortran-7 # https://gitlab.tiker.net/inducer/leap/issues/122 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: @@ -15,7 +14,6 @@ Python 2.7: script: - py_version=2.7 - EXTRA_INSTALL="numpy scipy" - - export FC=gfortran-7 # https://gitlab.tiker.net/inducer/leap/issues/122 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: @@ -28,7 +26,6 @@ Python 3.5: script: - py_version=3.5 - EXTRA_INSTALL="numpy scipy" - - export FC=gfortran-7 # https://gitlab.tiker.net/inducer/leap/issues/122 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: @@ -41,7 +38,6 @@ Python 3.6: script: - py_version=3.6 - EXTRA_INSTALL="numpy scipy" - - export FC=gfortran-7 # https://gitlab.tiker.net/inducer/leap/issues/122 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: -- GitLab