Skip to content

Commit 9ccb605

Browse files
mattatmetmattatmet
committed
Additional realignment
1 parent ac1b30e commit 9ccb605

4 files changed

Lines changed: 87 additions & 87 deletions

File tree

‎components/science/source/kernel/algebra/sci_sort_ref_kernel_mod.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ subroutine sort_ref_code_real64( nlayers, &
110110

111111
! Internal variables
112112
integer(kind=i_def) :: k, kcnt
113-
real(kind=real64) :: theta_k
113+
real(kind=real64) :: theta_k
114114

115115
do k = 1, nlayers
116116

‎components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w3_mod.F90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ subroutine compute_mass_matrix_w3_code_real32( &
125125
integer(kind=i_def) :: df, df2, k, ik, ipanel
126126
integer(kind=i_def) :: qp1, qp2
127127
real(kind=real32), dimension(ndf_chi) :: chi1_e, chi2_e, chi3_e
128-
real(kind=real32) :: integrand
128+
real(kind=real32) :: integrand
129129
real(kind=real32), dimension(nqp_h,nqp_v) :: dj
130130
real(kind=real32), dimension(3,3,nqp_h,nqp_v) :: jac
131131

@@ -218,7 +218,7 @@ subroutine compute_mass_matrix_w3_code_mixed_precision( &
218218
integer(kind=i_def) :: df, df2, k, ik, ipanel
219219
integer(kind=i_def) :: qp1, qp2
220220
real(kind=real64), dimension(ndf_chi) :: chi1_e, chi2_e, chi3_e
221-
real(kind=real64) :: integrand
221+
real(kind=real64) :: integrand
222222
real(kind=real64), dimension(nqp_h,nqp_v) :: dj
223223
real(kind=real64), dimension(3,3,nqp_h,nqp_v) :: jac
224224

@@ -311,7 +311,7 @@ subroutine compute_mass_matrix_w3_code_real64( &
311311
integer(kind=i_def) :: df, df2, k, ik, ipanel
312312
integer(kind=i_def) :: qp1, qp2
313313
real(kind=real64), dimension(ndf_chi) :: chi1_e, chi2_e, chi3_e
314-
real(kind=real64) :: integrand
314+
real(kind=real64) :: integrand
315315
real(kind=real64), dimension(nqp_h,nqp_v) :: dj
316316
real(kind=real64), dimension(3,3,nqp_h,nqp_v) :: jac
317317

‎components/science/source/kernel/fem/sci_compute_mass_matrix_kernel_w_scalar_mod.F90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ subroutine compute_mass_matrix_w_scalar_code_r32( &
146146
real(kind=real32), dimension(ndf_chi) :: chi1_e
147147
real(kind=real32), dimension(ndf_chi) :: chi2_e
148148
real(kind=real32), dimension(ndf_chi) :: chi3_e
149-
real(kind=real32) :: integrand
149+
real(kind=real32) :: integrand
150150
real(kind=real32), dimension(nqp_h,nqp_v) :: dj
151151
real(kind=real32), dimension(3,3,nqp_h,nqp_v) :: jac
152152

@@ -244,7 +244,7 @@ subroutine compute_mass_matrix_w_scalar_code_r32r64( &
244244
real(kind=real64), dimension(ndf_chi) :: chi1_e
245245
real(kind=real64), dimension(ndf_chi) :: chi2_e
246246
real(kind=real64), dimension(ndf_chi) :: chi3_e
247-
real(kind=real64) :: integrand
247+
real(kind=real64) :: integrand
248248
real(kind=real64), dimension(nqp_h,nqp_v) :: dj
249249
real(kind=real64), dimension(3,3,nqp_h,nqp_v) :: jac
250250

@@ -345,7 +345,7 @@ subroutine compute_mass_matrix_w_scalar_code_r64( &
345345
real(kind=real64), dimension(ndf_chi) :: chi1_e
346346
real(kind=real64), dimension(ndf_chi) :: chi2_e
347347
real(kind=real64), dimension(ndf_chi) :: chi3_e
348-
real(kind=real64) :: integrand
348+
real(kind=real64) :: integrand
349349
real(kind=real64), dimension(nqp_h,nqp_v) :: dj
350350
real(kind=real64), dimension(3,3,nqp_h,nqp_v) :: jac
351351

‎components/science/source/kernel/geometry/sci_coordinate_jacobian_mod.F90‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,18 @@ subroutine coordinate_jacobian_quadrature_real32( &
166166
real(kind=real32), intent(in) :: diff_basis(3,ndf,ngp_h,ngp_v)
167167

168168
! Local variables
169-
real(kind=real32) :: jac_ref2sph(3,3,ngp_h,ngp_v)
170-
real(kind=real32) :: jac_sph2XYZ(3,3)
171-
real(kind=real32) :: jac_sph2XYZ_vec(3,3,ngp_h*ngp_v)
172-
real(kind=real32) :: alpha_vec(ngp_h*ngp_v), beta_vec(ngp_h*ngp_v)
173-
real(kind=real32) :: longitude, latitude
174-
real(kind=real32) :: radius
175-
real(kind=real32) :: radius_vec(ngp_h*ngp_v)
176-
real(kind=real32) :: rotation_matrix(3,3)
177-
real(kind=real32) :: jac_S(3,3)
178-
real(kind=real32) :: stretch_factor
179-
real(kind=real32) :: native_x, native_y, native_z
180-
real(kind=real32) :: native_lon, native_lat
169+
real(kind=real32) :: jac_ref2sph(3,3,ngp_h,ngp_v)
170+
real(kind=real32) :: jac_sph2XYZ(3,3)
171+
real(kind=real32) :: jac_sph2XYZ_vec(3,3,ngp_h*ngp_v)
172+
real(kind=real32) :: alpha_vec(ngp_h*ngp_v), beta_vec(ngp_h*ngp_v)
173+
real(kind=real32) :: longitude, latitude
174+
real(kind=real32) :: radius
175+
real(kind=real32) :: radius_vec(ngp_h*ngp_v)
176+
real(kind=real32) :: rotation_matrix(3,3)
177+
real(kind=real32) :: jac_S(3,3)
178+
real(kind=real32) :: stretch_factor
179+
real(kind=real32) :: native_x, native_y, native_z
180+
real(kind=real32) :: native_lon, native_lat
181181

182182
logical(kind=l_def) :: to_rotate
183183
logical(kind=l_def) :: to_stretch
@@ -329,18 +329,18 @@ subroutine coordinate_jacobian_quadrature_real64( &
329329
real(kind=real64), intent(in) :: diff_basis(3,ndf,ngp_h,ngp_v)
330330

331331
! Local variables
332-
real(kind=real64) :: jac_ref2sph(3,3,ngp_h,ngp_v)
333-
real(kind=real64) :: jac_sph2XYZ(3,3)
334-
real(kind=real64) :: jac_sph2XYZ_vec(3,3,ngp_h*ngp_v)
335-
real(kind=real64) :: alpha_vec(ngp_h*ngp_v), beta_vec(ngp_h*ngp_v)
336-
real(kind=real64) :: longitude, latitude
337-
real(kind=real64) :: radius
338-
real(kind=real64) :: radius_vec(ngp_h*ngp_v)
339-
real(kind=real64) :: rotation_matrix(3,3)
340-
real(kind=real64) :: jac_S(3,3)
341-
real(kind=real64) :: stretch_factor
342-
real(kind=real64) :: native_x, native_y, native_z
343-
real(kind=real64) :: native_lon, native_lat
332+
real(kind=real64) :: jac_ref2sph(3,3,ngp_h,ngp_v)
333+
real(kind=real64) :: jac_sph2XYZ(3,3)
334+
real(kind=real64) :: jac_sph2XYZ_vec(3,3,ngp_h*ngp_v)
335+
real(kind=real64) :: alpha_vec(ngp_h*ngp_v), beta_vec(ngp_h*ngp_v)
336+
real(kind=real64) :: longitude, latitude
337+
real(kind=real64) :: radius
338+
real(kind=real64) :: radius_vec(ngp_h*ngp_v)
339+
real(kind=real64) :: rotation_matrix(3,3)
340+
real(kind=real64) :: jac_S(3,3)
341+
real(kind=real64) :: stretch_factor
342+
real(kind=real64) :: native_x, native_y, native_z
343+
real(kind=real64) :: native_lon, native_lat
344344

345345
logical(kind=l_def) :: to_rotate
346346
logical(kind=l_def) :: to_stretch
@@ -516,16 +516,16 @@ subroutine coordinate_jacobian_evaluator_real32( &
516516
real(kind=real32), intent(in) :: diff_basis(3,ndf,neval_points)
517517

518518
! Local variables
519-
real(kind=real32) :: jac_ref2sph(3,3,neval_points)
520-
real(kind=real32) :: jac_sph2XYZ(3,3)
521-
real(kind=real32) :: alpha, beta
522-
real(kind=real32) :: longitude, latitude
523-
real(kind=real32) :: radius
524-
real(kind=real32) :: rotation_matrix(3,3)
525-
real(kind=real32) :: jac_S(3,3)
526-
real(kind=real32) :: stretch_factor
527-
real(kind=real32) :: native_x, native_y, native_z
528-
real(kind=real32) :: native_lon, native_lat
519+
real(kind=real32) :: jac_ref2sph(3,3,neval_points)
520+
real(kind=real32) :: jac_sph2XYZ(3,3)
521+
real(kind=real32) :: alpha, beta
522+
real(kind=real32) :: longitude, latitude
523+
real(kind=real32) :: radius
524+
real(kind=real32) :: rotation_matrix(3,3)
525+
real(kind=real32) :: jac_S(3,3)
526+
real(kind=real32) :: stretch_factor
527+
real(kind=real32) :: native_x, native_y, native_z
528+
real(kind=real32) :: native_lon, native_lat
529529

530530
logical(kind=l_def) :: to_rotate
531531
logical(kind=l_def) :: to_stretch
@@ -655,16 +655,16 @@ subroutine coordinate_jacobian_evaluator_real64( &
655655
real(kind=real64), intent(in) :: diff_basis(3,ndf,neval_points)
656656

657657
! Local variables
658-
real(kind=real64) :: jac_ref2sph(3,3,neval_points)
659-
real(kind=real64) :: jac_sph2XYZ(3,3)
660-
real(kind=real64) :: alpha, beta
661-
real(kind=real64) :: longitude, latitude
662-
real(kind=real64) :: radius
663-
real(kind=real64) :: rotation_matrix(3,3)
664-
real(kind=real64) :: jac_S(3,3)
665-
real(kind=real64) :: stretch_factor
666-
real(kind=real64) :: native_x, native_y, native_z
667-
real(kind=real64) :: native_lon, native_lat
658+
real(kind=real64) :: jac_ref2sph(3,3,neval_points)
659+
real(kind=real64) :: jac_sph2XYZ(3,3)
660+
real(kind=real64) :: alpha, beta
661+
real(kind=real64) :: longitude, latitude
662+
real(kind=real64) :: radius
663+
real(kind=real64) :: rotation_matrix(3,3)
664+
real(kind=real64) :: jac_S(3,3)
665+
real(kind=real64) :: stretch_factor
666+
real(kind=real64) :: native_x, native_y, native_z
667+
real(kind=real64) :: native_lon, native_lat
668668

669669
logical(kind=l_def) :: to_rotate
670670
logical(kind=l_def) :: to_stretch
@@ -792,7 +792,7 @@ subroutine coordinate_jacobian_inverse_quadrature_real32( &
792792
real(kind=real32), intent(in) :: dj(ngp_h,ngp_v)
793793
real(kind=real32), intent(out) :: jac_inv(3,3,ngp_h,ngp_v)
794794

795-
real(kind=real32) :: dummy
795+
real(kind=real32) :: dummy
796796
integer(kind=i_def) :: i, k
797797

798798
!> @todo This is here to maintain the API. If it turns out we don't want
@@ -821,7 +821,7 @@ subroutine coordinate_jacobian_inverse_quadrature_real64( &
821821
real(kind=real64), intent(in) :: dj(ngp_h,ngp_v)
822822
real(kind=real64), intent(out) :: jac_inv(3,3,ngp_h,ngp_v)
823823

824-
real(kind=real64) :: dummy
824+
real(kind=real64) :: dummy
825825
integer(kind=i_def) :: i, k
826826

827827
!> @todo This is here to maintain the API. If it turns out we don't want
@@ -862,7 +862,7 @@ subroutine coordinate_jacobian_inverse_evaluator_real32( &
862862
real(kind=real32), intent(in) :: dj(neval_points)
863863
real(kind=real32), intent(out) :: jac_inv(3,3,neval_points)
864864

865-
real(kind=real32) :: dummy
865+
real(kind=real32) :: dummy
866866
integer(kind=i_def) :: i
867867

868868
!> @todo This is here to maintain the API. If it turns out we don't want
@@ -889,7 +889,7 @@ subroutine coordinate_jacobian_inverse_evaluator_real64( &
889889
real(kind=real64), intent(in) :: dj(neval_points)
890890
real(kind=real64), intent(out) :: jac_inv(3,3,neval_points)
891891

892-
real(kind=real64) :: dummy
892+
real(kind=real64) :: dummy
893893
integer(kind=i_def) :: i
894894

895895
!> @todo This is here to maintain the API. If it turns out we don't want
@@ -949,16 +949,16 @@ subroutine pointwise_coordinate_jacobian_real32( &
949949
real(kind=real32), intent(out) :: dj
950950

951951
! Local variables
952-
real(kind=real32) :: jac_ref2sph(3,3)
953-
real(kind=real32) :: jac_sph2XYZ(3,3)
954-
real(kind=real32) :: alpha, beta
955-
real(kind=real32) :: longitude, latitude
956-
real(kind=real32) :: radius
957-
real(kind=real32) :: rotation_matrix(3,3)
958-
real(kind=real32) :: jac_S(3,3)
959-
real(kind=real32) :: stretch_factor
960-
real(kind=real32) :: native_x, native_y, native_z
961-
real(kind=real32) :: native_lon, native_lat
952+
real(kind=real32) :: jac_ref2sph(3,3)
953+
real(kind=real32) :: jac_sph2XYZ(3,3)
954+
real(kind=real32) :: alpha, beta
955+
real(kind=real32) :: longitude, latitude
956+
real(kind=real32) :: radius
957+
real(kind=real32) :: rotation_matrix(3,3)
958+
real(kind=real32) :: jac_S(3,3)
959+
real(kind=real32) :: stretch_factor
960+
real(kind=real32) :: native_x, native_y, native_z
961+
real(kind=real32) :: native_lon, native_lat
962962

963963
logical(kind=l_def) :: to_rotate
964964
logical(kind=l_def) :: to_stretch
@@ -1068,16 +1068,16 @@ subroutine pointwise_coordinate_jacobian_real64( &
10681068
real(kind=real64), intent(out) :: dj
10691069

10701070
! Local variables
1071-
real(kind=real64) :: jac_ref2sph(3,3)
1072-
real(kind=real64) :: jac_sph2XYZ(3,3)
1073-
real(kind=real64) :: alpha, beta
1074-
real(kind=real64) :: longitude, latitude
1075-
real(kind=real64) :: radius
1076-
real(kind=real64) :: rotation_matrix(3,3)
1077-
real(kind=real64) :: jac_S(3,3)
1078-
real(kind=real64) :: stretch_factor
1079-
real(kind=real64) :: native_x, native_y, native_z
1080-
real(kind=real64) :: native_lon, native_lat
1071+
real(kind=real64) :: jac_ref2sph(3,3)
1072+
real(kind=real64) :: jac_sph2XYZ(3,3)
1073+
real(kind=real64) :: alpha, beta
1074+
real(kind=real64) :: longitude, latitude
1075+
real(kind=real64) :: radius
1076+
real(kind=real64) :: rotation_matrix(3,3)
1077+
real(kind=real64) :: jac_S(3,3)
1078+
real(kind=real64) :: stretch_factor
1079+
real(kind=real64) :: native_x, native_y, native_z
1080+
real(kind=real64) :: native_lon, native_lat
10811081

10821082
logical(kind=l_def) :: to_rotate
10831083
logical(kind=l_def) :: to_stretch
@@ -1335,8 +1335,8 @@ function jacobian_abr2XYZ_vec_real32( alpha, beta, radius, panel_id, ngp) &
13351335

13361336
real(kind=real32) :: jac_abr2XYZ(3,3,ngp)
13371337

1338-
real(kind=real32) :: tan_alpha, tan_beta, panel_rho
1339-
real(kind=real32) :: tan_ab, tan_aa_p1, tan_bb_p1, factor, oneoverrho
1338+
real(kind=real32) :: tan_alpha, tan_beta, panel_rho
1339+
real(kind=real32) :: tan_ab, tan_aa_p1, tan_bb_p1, factor, oneoverrho
13401340

13411341
integer(kind=i_def) :: k
13421342

@@ -1398,8 +1398,8 @@ function jacobian_abr2XYZ_vec_real64( alpha, beta, radius, panel_id, ngp) &
13981398

13991399
real(kind=real64) :: jac_abr2XYZ(3,3,ngp)
14001400

1401-
real(kind=real64) :: tan_alpha, tan_beta, panel_rho
1402-
real(kind=real64) :: tan_ab, tan_aa_p1, tan_bb_p1, factor, oneoverrho
1401+
real(kind=real64) :: tan_alpha, tan_beta, panel_rho
1402+
real(kind=real64) :: tan_ab, tan_aa_p1, tan_bb_p1, factor, oneoverrho
14031403

14041404
integer(kind=i_def) :: k
14051405

@@ -1605,13 +1605,13 @@ function jacobian_stretched_real32( longitude, latitude, radius, stretch) resul
16051605
real(kind=real32), intent(in) :: longitude, latitude
16061606
real(kind=real32), intent(in) :: radius, stretch
16071607

1608-
real(kind=real32) :: jac_llr2XYZ(3,3)
1609-
real(kind=real32) :: jac_XYZ2llr(3,3)
1608+
real(kind=real32) :: jac_llr2XYZ(3,3)
1609+
real(kind=real32) :: jac_XYZ2llr(3,3)
16101610

16111611
real(kind=real32), parameter :: one = 1.0_real32
16121612

1613-
real(kind=real32) :: lat_stretched, psi
1614-
real(kind=real32) :: jac_stretched(3,3)
1613+
real(kind=real32) :: lat_stretched, psi
1614+
real(kind=real32) :: jac_stretched(3,3)
16151615

16161616
! Compute stretched variables
16171617
lat_stretched = schmidt_transform_lat(latitude, stretch)
@@ -1644,13 +1644,13 @@ function jacobian_stretched_real64( longitude, latitude, radius, stretch) resul
16441644
real(kind=real64), intent(in) :: longitude, latitude
16451645
real(kind=real64), intent(in) :: radius, stretch
16461646

1647-
real(kind=real64) :: jac_llr2XYZ(3,3)
1648-
real(kind=real64) :: jac_XYZ2llr(3,3)
1647+
real(kind=real64) :: jac_llr2XYZ(3,3)
1648+
real(kind=real64) :: jac_XYZ2llr(3,3)
16491649

16501650
real(kind=real64), parameter :: one = 1.0_real64
16511651

1652-
real(kind=real64) :: lat_stretched, psi
1653-
real(kind=real64) :: jac_stretched(3,3)
1652+
real(kind=real64) :: lat_stretched, psi
1653+
real(kind=real64) :: jac_stretched(3,3)
16541654

16551655
! Compute stretched variables
16561656
lat_stretched = schmidt_transform_lat(latitude, stretch)

0 commit comments

Comments
 (0)