Avoid -Wtrampolines warnings

Author: cschwan

examples/fortran/lhapdf_example-deprecated.f90

@@ -1,52 +1,6 @@
-program lhapdf_example
-    use iso_c_binding
-    use pineappl
-
+module callbacks2
     implicit none
-
-    integer, parameter :: dp = kind(0.0d0)
-
-    type(pineappl_grid) :: grid
-    type(pineappl_lumi) :: lumi
-    type(pineappl_keyval) :: key_vals
-
-    type(pineappl_xfx) :: xfx
-    type(pineappl_alphas) :: alphas
-
-    integer, target :: alphas_flags(2)
-
-    lumi = pineappl_lumi_new()
-    call pineappl_lumi_add(lumi, 3, [0, 0, 1, -1, 2, -2], [1.0_dp, 1.0_dp, 1.0_dp])
-
-    key_vals = pineappl_keyval_new()
-    grid = pineappl_grid_new(lumi, 1, [2, 0, 0, 0], 2, [0.0_dp, 1.0_dp, 2.0_dp], key_vals)
-
-    call pineappl_grid_fill_all(grid, 0.5_dp, 0.5_dp, 100.0_dp, 0, 0.5_dp, [0.5_dp, 0.5_dp, 0.5_dp])
-    call pineappl_grid_fill_all(grid, 0.5_dp, 0.5_dp, 100.0_dp, 0, 1.5_dp, [1.5_dp, 1.5_dp, 1.5_dp])
-
-    call setlhaparm("SILENT")
-    call lhapdf_initpdfset_byname(0, "NNPDF31_nlo_as_0118_luxqed")
-    call lhapdf_initpdfset_byname(1, "MSHT20nnlo_as118")
-
-    ! calling pineappl_grid_convolve without any flags
-    xfx = pineappl_xfx(xfx_test1)
-    alphas = pineappl_alphas(alphas_test1)
-    write(*, *) "first pineappl_grid_convolve_with_one:"
-    write(*, *) pineappl_grid_convolve_with_one(grid, 2212, xfx, alphas, &
-        [.true.], [.true.], 1.0_dp, 1.0_dp)
-
-    ! calling pineappl_grid_convolve with two integer flags that are used in xfx_test2 and alphas_test2 to determine the set and member indices
-    xfx = pineappl_xfx(xfx_test2)
-    alphas = pineappl_alphas(alphas_test2)
-    alphas_flags = [1, 0]
-    write(*, *) "second pineappl_grid_convolve_with_one:"
-    write(*, *) pineappl_grid_convolve_with_one(grid, 2212, xfx, alphas, &
-        [.true.], [.true.], 1.0_dp, 1.0_dp, c_loc(alphas_flags(1)))
-
-    call pineappl_lumi_delete(lumi)
-    call pineappl_grid_delete(grid)
 contains
-
     ! Passing a Fortran procedure to C needs the iso_c_binding
     function xfx_test1(pdg_id, x, q2, state) bind(c)
         use iso_c_binding
@@ -111,5 +65,54 @@ function alphas_test2(q2, state) bind(c)
 
         call lhapdf_alphasq2(flags(1), flags(2), q2, alphas_test2)
     end function
+end module
 
+program lhapdf_example
+    use iso_c_binding
+    use pineappl
+    use callbacks2
+
+    implicit none
+
+    integer, parameter :: dp = kind(0.0d0)
+
+    type(pineappl_grid) :: grid
+    type(pineappl_lumi) :: lumi
+    type(pineappl_keyval) :: key_vals
+
+    type(pineappl_xfx) :: xfx
+    type(pineappl_alphas) :: alphas
+
+    integer, target :: alphas_flags(2)
+
+    lumi = pineappl_lumi_new()
+    call pineappl_lumi_add(lumi, 3, [0, 0, 1, -1, 2, -2], [1.0_dp, 1.0_dp, 1.0_dp])
+
+    key_vals = pineappl_keyval_new()
+    grid = pineappl_grid_new(lumi, 1, [2, 0, 0, 0], 2, [0.0_dp, 1.0_dp, 2.0_dp], key_vals)
+
+    call pineappl_grid_fill_all(grid, 0.5_dp, 0.5_dp, 100.0_dp, 0, 0.5_dp, [0.5_dp, 0.5_dp, 0.5_dp])
+    call pineappl_grid_fill_all(grid, 0.5_dp, 0.5_dp, 100.0_dp, 0, 1.5_dp, [1.5_dp, 1.5_dp, 1.5_dp])
+
+    call setlhaparm("SILENT")
+    call lhapdf_initpdfset_byname(0, "NNPDF31_nlo_as_0118_luxqed")
+    call lhapdf_initpdfset_byname(1, "MSHT20nnlo_as118")
+
+    ! calling pineappl_grid_convolve without any flags
+    xfx = pineappl_xfx(xfx_test1)
+    alphas = pineappl_alphas(alphas_test1)
+    write(*, *) "first pineappl_grid_convolve_with_one:"
+    write(*, *) pineappl_grid_convolve_with_one(grid, 2212, xfx, alphas, &
+        [.true.], [.true.], 1.0_dp, 1.0_dp)
+
+    ! calling pineappl_grid_convolve with two integer flags that are used in xfx_test2 and alphas_test2 to determine the set and member indices
+    xfx = pineappl_xfx(xfx_test2)
+    alphas = pineappl_alphas(alphas_test2)
+    alphas_flags = [1, 0]
+    write(*, *) "second pineappl_grid_convolve_with_one:"
+    write(*, *) pineappl_grid_convolve_with_one(grid, 2212, xfx, alphas, &
+        [.true.], [.true.], 1.0_dp, 1.0_dp, c_loc(alphas_flags(1)))
+
+    call pineappl_lumi_delete(lumi)
+    call pineappl_grid_delete(grid)
 end program lhapdf_example

examples/fortran/lhapdf_example.f90

@@ -1,6 +1,40 @@
+module callbacks4
+    implicit none
+contains
+    function wrap_xfx(pdg_id, x, q2, state) bind(c)
+        use iso_c_binding
+
+        implicit none
+
+        integer(c_int32_t), value, intent(in) :: pdg_id
+        real(c_double), value, intent(in)     :: x, q2
+        type(c_ptr), value, intent(in)        :: state
+        real(c_double)                        :: wrap_xfx
+        integer, pointer                      :: state_array(:)
+
+        call c_f_pointer(state, state_array, [2])
+        call lhapdf_xfxq2(state_array(1), state_array(2), pdg_id, x, q2, wrap_xfx)
+    end function
+
+    function wrap_alphasq2(q2, state) bind(c)
+        use iso_c_binding
+
+        implicit none
+
+        real(c_double), value, intent(in) :: q2
+        type(c_ptr), value, intent(in)    :: state
+        real(c_double)                    :: wrap_alphasq2
+        integer, pointer                      :: state_array(:)
+
+        call c_f_pointer(state, state_array, [2])
+        call lhapdf_alphasq2(state_array(1), state_array(2), q2, wrap_alphasq2)
+    end function
+end module
+
 program lhapdf_example
     use iso_c_binding
     use pineappl
+    use callbacks4
 
     implicit none
 
@@ -106,35 +140,4 @@ program lhapdf_example
     ! call pineappl_grid_write(grid, 'test.pineappl.lz4')
     call pineappl_channels_delete(channels)
     call pineappl_grid_delete(grid)
-contains
-
-    function wrap_xfx(pdg_id, x, q2, state) bind(c)
-        use iso_c_binding
-
-        implicit none
-
-        integer(c_int32_t), value, intent(in) :: pdg_id
-        real(c_double), value, intent(in)     :: x, q2
-        type(c_ptr), value, intent(in)        :: state
-        real(c_double)                        :: wrap_xfx
-        integer, pointer                      :: state_array(:)
-
-        call c_f_pointer(state, state_array, [2])
-        call lhapdf_xfxq2(state_array(1), state_array(2), pdg_id, x, q2, wrap_xfx)
-    end function
-
-    function wrap_alphasq2(q2, state) bind(c)
-        use iso_c_binding
-
-        implicit none
-
-        real(c_double), value, intent(in) :: q2
-        type(c_ptr), value, intent(in)    :: state
-        real(c_double)                    :: wrap_alphasq2
-        integer, pointer                      :: state_array(:)
-
-        call c_f_pointer(state, state_array, [2])
-        call lhapdf_alphasq2(state_array(1), state_array(2), q2, wrap_alphasq2)
-    end function
-
 end program lhapdf_example

examples/fortran/test-deprecated.f90

@@ -1,6 +1,62 @@
+module callbacks3
+    implicit none
+contains
+    function xfx1_test(pdg_id, x, q2, state) bind(c)
+        use iso_c_binding
+
+        implicit none
+
+        integer(c_int32_t), value, intent(in) :: pdg_id
+        real(c_double), value, intent(in)     :: x, q2
+        type(c_ptr), value, intent(in)        :: state
+        real(c_double)                        :: xfx1_test
+
+        ! ignore unused arguments
+        associate(pdg_id => pdg_id); end associate
+        associate(q2 => q2); end associate
+        associate(state => state); end associate
+
+        xfx1_test = x
+    end function
+
+    function xfx2_test(pdg_id, x, q2, state) bind(c)
+        use iso_c_binding
+
+        implicit none
+
+        integer(c_int32_t), value, intent(in) :: pdg_id
+        real(c_double), value, intent(in)     :: x, q2
+        type(c_ptr), value, intent(in)        :: state
+        real(c_double)                        :: xfx2_test
+
+        ! ignore unused arguments
+        associate(pdg_id => pdg_id); end associate
+        associate(q2 => q2); end associate
+        associate(state => state); end associate
+
+        xfx2_test = -x
+    end function
+
+    function alphas_test(q2, state) bind(c)
+        use iso_c_binding
+
+        implicit none
+
+        real(c_double), value, intent(in) :: q2
+        type(c_ptr), value, intent(in)    :: state
+        real(c_double)                    :: alphas_test
+
+        ! ignore unused argument
+        associate(state => state); end associate
+
+        alphas_test = q2
+    end function
+end module
+
 program test_pineappl
     use pineappl
     use iso_c_binding
+    use callbacks3
 
     implicit none
 
@@ -177,58 +233,4 @@ program test_pineappl
     call pineappl_lumi_delete(lumi)
 
     call pineappl_grid_delete(grid)
-
-contains
-
-    function xfx1_test(pdg_id, x, q2, state) bind(c)
-        use iso_c_binding
-
-        implicit none
-
-        integer(c_int32_t), value, intent(in) :: pdg_id
-        real(c_double), value, intent(in)     :: x, q2
-        type(c_ptr), value, intent(in)        :: state
-        real(c_double)                        :: xfx1_test
-
-        ! ignore unused arguments
-        associate(pdg_id => pdg_id); end associate
-        associate(q2 => q2); end associate
-        associate(state => state); end associate
-
-        xfx1_test = x
-    end function
-
-    function xfx2_test(pdg_id, x, q2, state) bind(c)
-        use iso_c_binding
-
-        implicit none
-
-        integer(c_int32_t), value, intent(in) :: pdg_id
-        real(c_double), value, intent(in)     :: x, q2
-        type(c_ptr), value, intent(in)        :: state
-        real(c_double)                        :: xfx2_test
-
-        ! ignore unused arguments
-        associate(pdg_id => pdg_id); end associate
-        associate(q2 => q2); end associate
-        associate(state => state); end associate
-
-        xfx2_test = -x
-    end function
-
-    function alphas_test(q2, state) bind(c)
-        use iso_c_binding
-
-        implicit none
-
-        real(c_double), value, intent(in) :: q2
-        type(c_ptr), value, intent(in)    :: state
-        real(c_double)                    :: alphas_test
-
-        ! ignore unused argument
-        associate(state => state); end associate
-
-        alphas_test = q2
-    end function
-
 end program test_pineappl