Skip to content

Commit 6be5f47

Browse files
RadonirinaunimiRadonirinaunimi
committed
Merge branch 'master' into parallelize-evolve
2 parents 47cc3e5 + c44def4 commit 6be5f47

3 files changed

Lines changed: 63 additions & 63 deletions

File tree

‎examples/fortran/lhapdf_example.f90‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ program lhapdf_example
6565
call pineappl_channels_add(channels, 3, [0, 0, 1, -1, 2, -2], [1.0_dp, 1.0_dp, 1.0_dp])
6666

6767
kinematics = [&
68-
pineappl_kinematics(pineappl_scale, 0), &
69-
pineappl_kinematics(pineappl_x, 0), &
70-
pineappl_kinematics(pineappl_x, 1) &
68+
pineappl_kinematics(pineappl_kinematics_tag_scale, 0), &
69+
pineappl_kinematics(pineappl_kinematics_tag_x, 0), &
70+
pineappl_kinematics(pineappl_kinematics_tag_x, 1) &
7171
]
7272

73-
q2_reweight = pineappl_no_reweight
74-
x_reweight = pineappl_applgrid_x
75-
q2_mapping = pineappl_applgrid_h0
76-
x_mapping = pineappl_applgrid_f2
77-
interpolation_meth = pineappl_lagrange
73+
q2_reweight = pineappl_reweight_meth_no_reweight
74+
x_reweight = pineappl_reweight_meth_applgrid_x
75+
q2_mapping = pineappl_map_applgrid_h0
76+
x_mapping = pineappl_map_applgrid_f2
77+
interpolation_meth = pineappl_interp_meth_lagrange
7878
interp_info = [ &
7979
pineappl_interp(1e2_dp, 1e8_dp, 40, 3, q2_reweight, q2_mapping, interpolation_meth), &
8080
pineappl_interp(2e-7_dp, 1.0_dp, 50, 3, x_reweight, x_mapping, interpolation_meth), &
@@ -83,17 +83,17 @@ program lhapdf_example
8383

8484
! The `pineappl_scale_func_form_body` objects have to defined with two fields - if not required, the value(s) will be ignored
8585
mu_scales_form = [ &
86-
pineappl_scale_func_form(PINEAPPL_SCALE_FUNC_FORM_SCALE, pineappl_scale_func_form_body(0, 0)), &
87-
pineappl_scale_func_form(PINEAPPL_SCALE_FUNC_FORM_SCALE, pineappl_scale_func_form_body(0, 0)), &
88-
pineappl_scale_func_form(PINEAPPL_SCALE_FUNC_FORM_NO_SCALE, pineappl_scale_func_form_body(0, 0)) &
86+
pineappl_scale_func_form(pineappl_scale_func_form_tag_scale, pineappl_scale_func_form_body(0, 0)), &
87+
pineappl_scale_func_form(pineappl_scale_func_form_tag_scale, pineappl_scale_func_form_body(0, 0)), &
88+
pineappl_scale_func_form(pineappl_scale_func_form_tag_no_scale, pineappl_scale_func_form_body(0, 0)) &
8989
]
9090

9191
convolutions = [ &
92-
pineappl_conv(pineappl_unpol_pdf, 2212), &
93-
pineappl_conv(pineappl_unpol_pdf, 2212) &
92+
pineappl_conv(pineappl_conv_type_unpol_pdf, 2212), &
93+
pineappl_conv(pineappl_conv_type_unpol_pdf, 2212) &
9494
]
9595

96-
grid = pineappl_grid_new2(2, [0.0_dp, 1.0_dp, 2.0_dp], 1, [2_1, 0_1, 0_1, 0_1, 0_1], channels, pineappl_pdg, &
96+
grid = pineappl_grid_new2(2, [0.0_dp, 1.0_dp, 2.0_dp], 1, [2_1, 0_1, 0_1, 0_1, 0_1], channels, pineappl_pid_basis_pdg, &
9797
convolutions, 3, interp_info, kinematics, mu_scales_form)
9898

9999
call pineappl_grid_fill_all2(grid, 0, 0.5_dp, [100.0_dp, 0.5_dp, 0.5_dp], [0.5_dp, 0.5_dp, 0.5_dp])

‎examples/fortran/pineappl.f90‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -26,71 +26,71 @@ module pineappl
2626
! As a workaround for typing Fortran enums, we define the name of the enum as the last enum value. This way, variables can be declared as, e.g. for pineappl_conv_type, integer(kind(pineappl_conv_type)). The compiler doesn't check that a value is from the right enum, but it clarifies the code for the user.
2727

2828
enum, bind(c) ! :: pineappl_conv_type
29-
enumerator :: pineappl_unpol_pdf
30-
enumerator :: pineappl_pol_pdf
31-
enumerator :: pineappl_unpol_ff
32-
enumerator :: pineappl_pol_ff
29+
enumerator :: pineappl_conv_type_unpol_pdf
30+
enumerator :: pineappl_conv_type_pol_pdf
31+
enumerator :: pineappl_conv_type_unpol_ff
32+
enumerator :: pineappl_conv_type_pol_ff
3333

3434
enumerator :: pineappl_conv_type
3535
end enum
3636

3737
enum, bind(c) ! :: pineappl_interp_meth
38-
enumerator :: pineappl_lagrange
38+
enumerator :: pineappl_interp_meth_lagrange
3939

4040
enumerator :: pineappl_interp_meth
4141
end enum
4242

4343
enum, bind(c) ! :: pineappl_map
44-
enumerator :: pineappl_applgrid_f2
45-
enumerator :: pineappl_applgrid_h0
44+
enumerator :: pineappl_map_applgrid_f2
45+
enumerator :: pineappl_map_applgrid_h0
4646

4747
enumerator :: pineappl_map
4848
end enum
4949

5050
enum, bind(c) ! :: pineappl_pid_basis
51-
enumerator :: pineappl_pdg
52-
enumerator :: pineappl_evol
51+
enumerator :: pineappl_pid_basis_pdg
52+
enumerator :: pineappl_pid_basis_evol
5353

5454
enumerator :: pineappl_pid_basis
5555
end enum
5656

5757
enum, bind(c) ! :: pineappl_reweight_meth
58-
enumerator :: pineappl_applgrid_x
59-
enumerator :: pineappl_no_reweight
58+
enumerator :: pineappl_reweight_meth_applgrid_x
59+
enumerator :: pineappl_reweight_meth_no_reweight
6060

6161
enumerator :: pineappl_reweight_meth
6262
end enum
6363

6464
enum, bind(c) ! :: pineappl_kinematics_tag
65-
enumerator :: pineappl_scale
66-
enumerator :: pineappl_x
65+
enumerator :: pineappl_kinematics_tag_scale
66+
enumerator :: pineappl_kinematics_tag_x
6767

6868
enumerator :: pineappl_kinematics_tag
6969
end enum
7070

7171
enum, bind(c) ! :: pineappl_scale_func_form_tag
72-
enumerator :: pineappl_scale_func_form_no_scale
73-
enumerator :: pineappl_scale_func_form_scale
74-
enumerator :: pineappl_scale_func_form_quadratic_sum
75-
enumerator :: pineappl_scale_func_form_quadratic_mean
76-
enumerator :: pineappl_scale_func_form_quadratic_sum_over4
77-
enumerator :: pineappl_scale_func_form_linear_mean
78-
enumerator :: pineappl_scale_func_form_linear_sum
79-
enumerator :: pineappl_scale_func_form_scale_max
80-
enumerator :: pineappl_scale_func_form_scale_min
81-
enumerator :: pineappl_scale_func_form_prod
82-
enumerator :: pineappl_scale_func_form_s2plus_s1half
83-
enumerator :: pineappl_scale_func_form_pow4_sum
84-
enumerator :: pineappl_scale_func_form_wgt_avg
85-
enumerator :: pineappl_scale_func_form_s2plus_s1fourth
86-
enumerator :: pineappl_scale_func_form_exp_prod2
72+
enumerator :: pineappl_scale_func_form_tag_no_scale
73+
enumerator :: pineappl_scale_func_form_tag_scale
74+
enumerator :: pineappl_scale_func_form_tag_quadratic_sum
75+
enumerator :: pineappl_scale_func_form_tag_quadratic_mean
76+
enumerator :: pineappl_scale_func_form_tag_quadratic_sum_over4
77+
enumerator :: pineappl_scale_func_form_tag_linear_mean
78+
enumerator :: pineappl_scale_func_form_tag_linear_sum
79+
enumerator :: pineappl_scale_func_form_tag_scale_max
80+
enumerator :: pineappl_scale_func_form_tag_scale_min
81+
enumerator :: pineappl_scale_func_form_tag_prod
82+
enumerator :: pineappl_scale_func_form_tag_s2plus_s1half
83+
enumerator :: pineappl_scale_func_form_tag_pow4_sum
84+
enumerator :: pineappl_scale_func_form_tag_wgt_avg
85+
enumerator :: pineappl_scale_func_form_tag_s2plus_s1fourth
86+
enumerator :: pineappl_scale_func_form_tag_exp_prod2
8787

8888
enumerator :: pineappl_scale_func_form_tag
8989
end enum
9090

9191
! The Kinematics struct is a tuple-like struct in the PineAPPL Rust code, which is realized as a C union. Fortran does not support unions, but fortunately the union is only for storing ints, so we just use an integer variable for `index`
9292
type, bind(c) :: pineappl_kinematics
93-
integer(kind(pineappl_kinematics_tag)) :: tag
93+
integer(c_int) :: tag
9494
integer(c_size_t) :: index
9595
end type
9696

@@ -101,12 +101,12 @@ module pineappl
101101
end type
102102

103103
type, bind(c) :: pineappl_scale_func_form
104-
integer(kind(pineappl_scale_func_form_tag)) :: tag
104+
integer(c_int) :: tag
105105
type(pineappl_scale_func_form_body) :: body
106106
end type
107107

108108
type, bind(c) :: pineappl_conv
109-
integer(kind(pineappl_conv_type)) :: conv_type
109+
integer(c_int) :: conv_type
110110
integer(c_int32_t) :: pid
111111
end type
112112

@@ -115,9 +115,9 @@ module pineappl
115115
real(c_double) :: max
116116
integer(c_size_t) :: nodes
117117
integer(c_size_t) :: order
118-
integer(kind(pineappl_reweight_meth)) :: reweighting_method
119-
integer(kind(pineappl_map)) :: mapping
120-
integer(kind(pineappl_interp_meth)) :: interpolation_method
118+
integer(c_int) :: reweighting_method
119+
integer(c_int) :: mapping
120+
integer(c_int) :: interpolation_method
121121
end type
122122

123123
type :: pineappl_xfx

‎examples/fortran/test.f90‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,16 @@ program test_pineappl
115115
end if
116116

117117
kinematics = [ &
118-
pineappl_kinematics(pineappl_scale, 0), &
119-
pineappl_kinematics(pineappl_x, 0), &
120-
pineappl_kinematics(pineappl_x, 1) &
118+
pineappl_kinematics(pineappl_kinematics_tag_scale, 0), &
119+
pineappl_kinematics(pineappl_kinematics_tag_x, 0), &
120+
pineappl_kinematics(pineappl_kinematics_tag_x, 1) &
121121
]
122122

123-
q2_reweight = pineappl_no_reweight
124-
x_reweight = pineappl_applgrid_x
125-
q2_mapping = pineappl_applgrid_h0
126-
x_mapping = pineappl_applgrid_f2
127-
interpolation_meth = pineappl_lagrange
123+
q2_reweight = pineappl_reweight_meth_no_reweight
124+
x_reweight = pineappl_reweight_meth_applgrid_x
125+
q2_mapping = pineappl_map_applgrid_h0
126+
x_mapping = pineappl_map_applgrid_f2
127+
interpolation_meth = pineappl_interp_meth_lagrange
128128
interp_info = [ &
129129
pineappl_interp(1e2_dp, 1e8_dp, 40, 3, q2_reweight, q2_mapping, interpolation_meth), &
130130
pineappl_interp(2e-7_dp, 1.0_dp, 50, 3, x_reweight, x_mapping, interpolation_meth), &
@@ -133,17 +133,17 @@ program test_pineappl
133133

134134
! The `pineappl_scale_func_form_body` objects have to defined with two fields - if not required, the value(s) will be ignored
135135
mu_scales_form = [ &
136-
pineappl_scale_func_form(PINEAPPL_SCALE_FUNC_FORM_SCALE, pineappl_scale_func_form_body(0, 0)), &
137-
pineappl_scale_func_form(PINEAPPL_SCALE_FUNC_FORM_SCALE, pineappl_scale_func_form_body(0, 0)), &
138-
pineappl_scale_func_form(PINEAPPL_SCALE_FUNC_FORM_NO_SCALE, pineappl_scale_func_form_body(0, 0)) &
136+
pineappl_scale_func_form(pineappl_scale_func_form_tag_scale, pineappl_scale_func_form_body(0, 0)), &
137+
pineappl_scale_func_form(pineappl_scale_func_form_tag_scale, pineappl_scale_func_form_body(0, 0)), &
138+
pineappl_scale_func_form(pineappl_scale_func_form_tag_no_scale, pineappl_scale_func_form_body(0, 0)) &
139139
]
140140

141141
convolutions = [ &
142-
pineappl_conv(pineappl_unpol_pdf, 2212), &
143-
pineappl_conv(pineappl_unpol_pdf, 2212) &
142+
pineappl_conv(pineappl_conv_type_unpol_pdf, 2212), &
143+
pineappl_conv(pineappl_conv_type_unpol_pdf, 2212) &
144144
]
145145

146-
grid = pineappl_grid_new2(2, [0.0_dp, 1.0_dp, 2.0_dp], 1, [2_1, 0_1, 0_1, 0_1, 0_1], channels, pineappl_pdg, &
146+
grid = pineappl_grid_new2(2, [0.0_dp, 1.0_dp, 2.0_dp], 1, [2_1, 0_1, 0_1, 0_1, 0_1], channels, pineappl_pid_basis_pdg, &
147147
convolutions, 3, interp_info, kinematics, mu_scales_form)
148148

149149
if (pineappl_grid_order_count(grid) /= 1) then
@@ -210,7 +210,7 @@ program test_pineappl
210210
error stop "error: pineappl_channels_combinations"
211211
end if
212212

213-
grid2 = pineappl_grid_new2(1, [2.0_dp, 3.0_dp], 1, [2_1, 0_1, 0_1, 0_1, 0_1], channels, pineappl_pdg, &
213+
grid2 = pineappl_grid_new2(1, [2.0_dp, 3.0_dp], 1, [2_1, 0_1, 0_1, 0_1, 0_1], channels, pineappl_pid_basis_pdg, &
214214
convolutions, 3, interp_info, kinematics, mu_scales_form)
215215

216216
call pineappl_grid_merge_and_delete(grid, grid2)

0 commit comments

Comments
 (0)