Skip to content

Commit ca3be92

Browse files
committed
Split vector products routines into new module
1 parent 9b1099f commit ca3be92

File tree

6 files changed

+261
-35
lines changed

6 files changed

+261
-35
lines changed

src/Fortran_libraries/MHD_src/sph_MHD/cal_ene_flux_by_sym_rtp.f90

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ subroutine cal_work_of_lorentz_on_node &
165165
& nnod, ntot_comp_fld, fld_rtp, ntot_comp_frc, frc_rtp, &
166166
& ntot_comp_flx, flx_rtp)
167167
!
168-
use cal_products_smp
168+
use cal_vector_products
169169
!
170170
type(base_field_address), intent(in) :: bs_trns_base
171171
type(base_force_address), intent(in) :: f_trns_frc
@@ -180,7 +180,7 @@ subroutine cal_work_of_lorentz_on_node &
180180
real(kind = kreal), intent(inout) :: flx_rtp(nnod,ntot_comp_flx)
181181
!
182182
if(fs_trns_eflux%i_ujb .gt. 0) then
183-
call cal_dot_prod_no_coef_smp(nnod, &
183+
call cal_dot_product_no_coef(nnod, &
184184
& frc_rtp(1,f_trns_frc%i_lorentz), &
185185
& fld_rtp(1,bs_trns_base%i_velo), &
186186
& flx_rtp(1,fs_trns_eflux%i_ujb) )
@@ -195,7 +195,7 @@ subroutine cal_work_of_inertia_on_node &
195195
& nnod, ntot_comp_fld, fld_rtp, ntot_comp_frc, frc_rtp, &
196196
& ntot_comp_flx, flx_rtp)
197197
!
198-
use cal_products_smp
198+
use cal_vector_products
199199
!
200200
type(base_field_address), intent(in) :: bs_trns_base
201201
type(base_force_address), intent(in) :: f_trns_frc
@@ -210,7 +210,7 @@ subroutine cal_work_of_inertia_on_node &
210210
real(kind = kreal), intent(inout) :: flx_rtp(nnod,ntot_comp_flx)
211211
!
212212
if(fs_trns_eflux%i_m_advect_work .gt. 0) then
213-
call cal_dot_prod_no_coef_smp(nnod, &
213+
call cal_dot_product_no_coef(nnod, &
214214
& frc_rtp(1,f_trns_frc%i_m_advect), &
215215
& fld_rtp(1,bs_trns_base%i_velo), &
216216
& flx_rtp(1,fs_trns_eflux%i_m_advect_work) )
@@ -226,7 +226,7 @@ subroutine cal_ene_flux_by_induct_on_node &
226226
& nnod, ntot_comp_fld, fld_rtp, ntot_comp_frc, frc_rtp, &
227227
& ntot_comp_flx, flx_rtp)
228228
!
229-
use cal_products_smp
229+
use cal_vector_products
230230
!
231231
type(base_field_address), intent(in) :: bs_trns_base
232232
type(base_force_address), intent(in) :: ipol_frc
@@ -241,7 +241,7 @@ subroutine cal_ene_flux_by_induct_on_node &
241241
real(kind = kreal), intent(inout) :: flx_rtp(nnod,ntot_comp_flx)
242242
!
243243
if(fs_trns_eflux%i_me_gen .gt. 0) then
244-
call cal_dot_prod_no_coef_smp(nnod, &
244+
call cal_dot_product_no_coef(nnod, &
245245
& frc_rtp(1,ipol_frc%i_induction), &
246246
& fld_rtp(1,bs_trns_base%i_magne), &
247247
& flx_rtp(1,fs_trns_eflux%i_me_gen) )

src/Fortran_libraries/MHD_src/sph_MHD/cal_energy_flux_rtp.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ subroutine cal_energy_fluxes_on_node &
128128
& nnod, ntot_comp_fld, fld_rtp, ntot_comp_frc, frc_rtp, &
129129
& ntot_comp_uxb, fub_rtp, ntot_comp_flx, flx_rtp)
130130
!
131-
use cal_products_smp
131+
use cal_vector_products
132132
!
133133
type(base_field_address), intent(in) :: bs_trns_base
134134
type(base_force_address), intent(in) :: f_trns_frc
@@ -145,21 +145,21 @@ subroutine cal_energy_fluxes_on_node &
145145
real(kind = kreal), intent(inout) :: flx_rtp(nnod,ntot_comp_flx)
146146
!
147147
if(fs_trns_eflux%i_ujb .gt. 0) then
148-
call cal_dot_prod_no_coef_smp(nnod, &
148+
call cal_dot_product_no_coef(nnod, &
149149
& frc_rtp(1,f_trns_frc%i_lorentz), &
150150
& fld_rtp(1,bs_trns_base%i_velo), &
151151
& flx_rtp(1,fs_trns_eflux%i_ujb) )
152152
end if
153153
!
154154
if(fs_trns_eflux%i_nega_ujb .gt. 0) then
155-
call cal_dot_prod_w_coef_smp(nnod, dminus, &
155+
call cal_dot_product_w_coef(nnod, dminus, &
156156
& frc_rtp(1,f_trns_frc%i_lorentz), &
157157
& fld_rtp(1,bs_trns_base%i_velo), &
158158
& flx_rtp(1,fs_trns_eflux%i_nega_ujb))
159159
end if
160160
!
161161
if(fs_trns_eflux%i_me_gen .gt. 0) then
162-
call cal_dot_prod_no_coef_smp(nnod, &
162+
call cal_dot_product_no_coef(nnod, &
163163
& fub_rtp(1,be_trns_frc%i_induction), &
164164
& fld_rtp(1,bs_trns_base%i_magne), &
165165
& flx_rtp(1,fs_trns_eflux%i_me_gen))

src/Fortran_libraries/MHD_src/sph_MHD/cal_helicities_rtp.f90

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ subroutine cal_helicity_on_node &
103103
& (bs_trns_base, fe_trns_prod, nnod, &
104104
& ntot_comp_fld, fld_rtp, ntot_comp_hls, fhls_rtp)
105105
!
106-
use cal_products_smp
106+
use cal_vector_products
107107
!
108108
type(base_field_address), intent(in) :: bs_trns_base
109109
type(phys_products_address), intent(in) :: fe_trns_prod
@@ -116,19 +116,19 @@ subroutine cal_helicity_on_node &
116116
!
117117
!
118118
if(fe_trns_prod%i_k_heli .gt. 0) then
119-
call cal_dot_prod_no_coef_smp(nnod, &
119+
call cal_dot_product_no_coef(nnod, &
120120
& fld_rtp(1,bs_trns_base%i_velo), &
121121
& fld_rtp(1,bs_trns_base%i_vort), &
122122
& fhls_rtp(1,fe_trns_prod%i_k_heli))
123123
end if
124124
if(fe_trns_prod%i_c_heli .gt. 0) then
125-
call cal_dot_prod_no_coef_smp(nnod, &
125+
call cal_dot_product_no_coef(nnod, &
126126
& fld_rtp(1,bs_trns_base%i_magne), &
127127
& fld_rtp(1,bs_trns_base%i_current), &
128128
& fhls_rtp(1,fe_trns_prod%i_c_heli))
129129
end if
130130
if(fe_trns_prod%i_x_heli .gt. 0) then
131-
call cal_dot_prod_no_coef_smp(nnod, &
131+
call cal_dot_product_no_coef(nnod, &
132132
& fld_rtp(1,bs_trns_base%i_velo), &
133133
& fld_rtp(1,bs_trns_base%i_magne), &
134134
& fhls_rtp(1,fe_trns_prod%i_x_heli))
@@ -185,13 +185,13 @@ subroutine cal_square_vector_on_node &
185185
& fmag_rtp(1,fe_trns_prod%i_square_j))
186186
end if
187187
if(fe_trns_prod%i_square_t .gt. 0) then
188-
call cal_scalar_prod_no_coef_smp(nnod, &
188+
call cal_scalar_product_no_coef(nnod, &
189189
& fld_rtp(1,bs_trns_base%i_temp), &
190190
& fld_rtp(1,bs_trns_base%i_temp), &
191191
& fmag_rtp(1,fe_trns_prod%i_square_t))
192192
end if
193193
if(fe_trns_prod%i_square_c .gt. 0) then
194-
call cal_scalar_prod_no_coef_smp(nnod, &
194+
call cal_scalar_product_no_coef(nnod, &
195195
& fld_rtp(1,bs_trns_base%i_light), &
196196
& fld_rtp(1,bs_trns_base%i_light), &
197197
& fmag_rtp(1,fe_trns_prod%i_square_c))

src/Fortran_libraries/MHD_src/sph_MHD/cal_lorentz_by_dipole.f90

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ subroutine lorentz_frc_and_work_by_dipole &
6767
& (fl_prop, bs_trns_base, bs_trns_prod, fs_trns_prod, &
6868
& nnod, ntot_comp_fld, fld_rtp, ntot_comp_flx, frc_rtp)
6969
!
70-
use cal_products_smp
70+
use cal_vector_products
7171
!
7272
type(fluid_property), intent(in) :: fl_prop
7373
type(base_field_address), intent(in) :: bs_trns_base
@@ -83,17 +83,19 @@ subroutine lorentz_frc_and_work_by_dipole &
8383
!
8484
if(fs_trns_prod%i_dipole_Lorentz .gt. 0) then
8585
!
86-
if(iflag_debug.gt.0) write(*,*) 'cal_dot_prod_no_coef_smp for dipole lorentz'
87-
call cal_cross_prod_w_coef_smp(nnod, fl_prop%coef_lor, &
86+
if(iflag_debug.gt.0) write(*,*) &
87+
& 'cal_cross_product_w_coef for dipole lorentz'
88+
call cal_cross_product_w_coef(nnod, fl_prop%coef_lor, &
8889
& fld_rtp(1,bs_trns_prod%i_dipole_J), &
8990
& fld_rtp(1,bs_trns_base%i_magne), &
9091
& frc_rtp(1,fs_trns_prod%i_dipole_Lorentz) )
9192
end if
9293
!
9394
if(fs_trns_prod%i_dipole_ujb .gt. 0) then
9495
!
95-
if(iflag_debug.gt.0) write(*,*) 'cal_dot_prod_no_coef_smp for dipole ujb'
96-
call cal_dot_prod_no_coef_smp(nnod, &
96+
if(iflag_debug.gt.0) write(*,*) &
97+
& 'cal_dot_product_no_coef for dipole ujb'
98+
call cal_dot_product_no_coef(nnod, &
9799
& frc_rtp(1,fs_trns_prod%i_dipole_Lorentz), &
98100
& fld_rtp(1,bs_trns_base%i_velo), &
99101
& frc_rtp(1,fs_trns_prod%i_dipole_ujb) )

src/Fortran_libraries/MHD_src/sph_MHD/cal_nonlinear_sph_MHD.f90

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ subroutine nonlinear_terms_on_node &
158158
& nnod, ntot_comp_fld, fld_rtp, ntot_comp_frc, frc_rtp)
159159
!
160160
use cal_products_smp
161+
use cal_vector_products
161162
!
162163
type(MHD_evolution_param), intent(in) :: MHD_prop
163164
type(base_field_address), intent(in) :: b_trns_base
@@ -169,22 +170,22 @@ subroutine nonlinear_terms_on_node &
169170
real(kind = kreal), intent(inout) :: frc_rtp(nnod,ntot_comp_frc)
170171
!
171172
if(f_trns_frc%i_m_advect .gt. 0) then
172-
call cal_cross_prod_w_coef_smp &
173+
call cal_cross_product_w_coef &
173174
& (nnod, MHD_prop%fl_prop%coef_velo, &
174175
& fld_rtp(1,b_trns_base%i_vort), &
175176
& fld_rtp(1,b_trns_base%i_velo), &
176177
& frc_rtp(1,f_trns_frc%i_m_advect) )
177178
end if
178179
!
179180
if(f_trns_frc%i_lorentz .gt. 0) then
180-
call cal_cross_prod_w_coef_smp &
181+
call cal_cross_product_w_coef &
181182
& (nnod, MHD_prop%fl_prop%coef_lor, &
182183
& fld_rtp(1,b_trns_base%i_current), &
183184
& fld_rtp(1,b_trns_base%i_magne), &
184185
& frc_rtp(1,f_trns_frc%i_lorentz) )
185186
!
186187
if(b_trns_base%i_back_B .gt. 0) then
187-
call add_cross_prod_w_coef_smp &
188+
call add_cross_product_w_coef &
188189
& (nnod, MHD_prop%fl_prop%coef_lor, &
189190
& fld_rtp(1,b_trns_base%i_current), &
190191
& fld_rtp(1,b_trns_base%i_back_B), &
@@ -194,14 +195,14 @@ subroutine nonlinear_terms_on_node &
194195
!
195196
!
196197
if(f_trns_frc%i_vp_induct .gt. 0) then
197-
call cal_cross_prod_w_coef_smp &
198+
call cal_cross_product_w_coef &
198199
& (nnod, MHD_prop%cd_prop%coef_induct, &
199200
& fld_rtp(1,b_trns_base%i_velo), &
200201
& fld_rtp(1,b_trns_base%i_magne), &
201202
& frc_rtp(1,f_trns_frc%i_vp_induct) )
202203
!
203204
if(b_trns_base%i_back_B .gt. 0) then
204-
call add_cross_prod_w_coef_smp &
205+
call add_cross_product_w_coef &
205206
& (nnod, MHD_prop%cd_prop%coef_induct, &
206207
& fld_rtp(1,b_trns_base%i_velo), &
207208
& fld_rtp(1,b_trns_base%i_back_B), &
@@ -211,15 +212,15 @@ subroutine nonlinear_terms_on_node &
211212
!
212213
!
213214
if(f_trns_frc%i_h_flux .gt. 0) then
214-
call cal_vec_scalar_prod_w_coef_smp &
215+
call cal_vec_scalar_product_w_coef &
215216
& (nnod, MHD_prop%ht_prop%coef_advect, &
216217
& fld_rtp(1,b_trns_base%i_velo), &
217218
& fld_rtp(1,b_trns_base%i_temp), &
218219
& frc_rtp(1,f_trns_frc%i_h_flux) )
219220
end if
220221
!
221222
if(f_trns_frc%i_c_flux .gt. 0) then
222-
call cal_vec_scalar_prod_w_coef_smp &
223+
call cal_vec_scalar_product_w_coef &
223224
& (nnod, MHD_prop%cp_prop%coef_advect, &
224225
& fld_rtp(1,b_trns_base%i_velo), &
225226
& fld_rtp(1,b_trns_base%i_light), &
@@ -236,6 +237,7 @@ subroutine nonlinear_terms_on_node_w_sym &
236237
& nnod, ntot_comp_fld, fld_rtp, ntot_comp_frc, frc_rtp)
237238
!
238239
use cal_products_smp
240+
use cal_vector_products
239241
!
240242
type(MHD_evolution_param), intent(in) :: MHD_prop
241243
type(base_field_address), intent(in) :: b_trns_base_1
@@ -249,22 +251,22 @@ subroutine nonlinear_terms_on_node_w_sym &
249251
!
250252
!
251253
if(f_trns_frc%i_m_advect .gt. 0) then
252-
call cal_cross_prod_w_coef_smp &
254+
call cal_cross_product_w_coef &
253255
& (nnod, MHD_prop%fl_prop%coef_velo, &
254256
& fld_rtp(1,b_trns_base_1%i_vort), &
255257
& fld_rtp(1,b_trns_base_2%i_velo), &
256258
& frc_rtp(1,f_trns_frc%i_m_advect) )
257259
end if
258260
!
259261
if(f_trns_frc%i_lorentz .gt. 0) then
260-
call cal_cross_prod_w_coef_smp &
262+
call cal_cross_product_w_coef &
261263
& (nnod, MHD_prop%fl_prop%coef_lor, &
262264
& fld_rtp(1,b_trns_base_1%i_current), &
263265
& fld_rtp(1,b_trns_base_2%i_magne), &
264266
& frc_rtp(1,f_trns_frc%i_lorentz) )
265267
!
266268
if(b_trns_base_2%i_back_B .gt. 0) then
267-
call add_cross_prod_w_coef_smp &
269+
call add_cross_product_w_coef &
268270
& (nnod, MHD_prop%fl_prop%coef_lor, &
269271
& fld_rtp(1,b_trns_base_1%i_current), &
270272
& fld_rtp(1,b_trns_base_2%i_back_B), &
@@ -274,14 +276,14 @@ subroutine nonlinear_terms_on_node_w_sym &
274276
!
275277
!
276278
if(f_trns_frc%i_vp_induct .gt. 0) then
277-
call cal_cross_prod_w_coef_smp &
279+
call cal_cross_product_w_coef &
278280
& (nnod, MHD_prop%cd_prop%coef_induct, &
279281
& fld_rtp(1,b_trns_base_1%i_velo), &
280282
& fld_rtp(1,b_trns_base_2%i_magne), &
281283
& frc_rtp(1,f_trns_frc%i_vp_induct) )
282284
!
283285
if(b_trns_base_2%i_back_B .gt. 0) then
284-
call add_cross_prod_w_coef_smp &
286+
call add_cross_product_w_coef &
285287
& (nnod, MHD_prop%cd_prop%coef_induct, &
286288
& fld_rtp(1,b_trns_base_1%i_velo), &
287289
& fld_rtp(1,b_trns_base_2%i_back_B), &
@@ -291,15 +293,15 @@ subroutine nonlinear_terms_on_node_w_sym &
291293
!
292294
!
293295
if(f_trns_frc%i_h_flux .gt. 0) then
294-
call cal_vec_scalar_prod_w_coef_smp &
296+
call cal_vec_scalar_product_w_coef &
295297
& (nnod, MHD_prop%ht_prop%coef_advect, &
296298
& fld_rtp(1,b_trns_base_1%i_velo), &
297299
& fld_rtp(1,b_trns_base_2%i_temp), &
298300
& frc_rtp(1,f_trns_frc%i_h_flux) )
299301
end if
300302
!
301303
if(f_trns_frc%i_c_flux .gt. 0) then
302-
call cal_vec_scalar_prod_w_coef_smp &
304+
call cal_vec_scalar_product_w_coef &
303305
& (nnod, MHD_prop%cp_prop%coef_advect, &
304306
& fld_rtp(1,b_trns_base_1%i_velo), &
305307
& fld_rtp(1,b_trns_base_2%i_light), &

0 commit comments

Comments
 (0)