Skip to content

Commit 0506969

Browse files
Fix/spelling typos 1498 (#1623)
Co-authored-by: Spencer Bryngelson <sbryngelson@gmail.com>
1 parent 9478e2d commit 0506969

5 files changed

Lines changed: 36 additions & 36 deletions

File tree

src/common/include/ExtrusionHardcodedIC.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
end select
193193
#:enddef
194194

195-
#:def HardcodedDellacation()
195+
#:def HardcodedDeallocation()
196196
if (allocated(stored_values)) then
197197
@:DEALLOCATE(stored_values)
198198
@:DEALLOCATE(x_coords)

src/common/m_finite_differences.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ contains
3939

4040
#ifdef MFC_POST_PROCESS
4141
if (allocated(fd_coeff_s)) deallocate (fd_coeff_s)
42-
allocate (fd_coeff_s(-fd_number_in:fd_number_in,lb:lE))
42+
allocate (fd_coeff_s(-fd_number_in:fd_number_in,lB:lE))
4343
#endif
4444

4545
! Computing the 1st order finite-difference coefficients

src/pre_process/m_icpp_patches.fpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ contains
216216
if (1._wp - eta < sgm_eps) patch_id_fp(i, 0, 0) = patch_id
217217
end if
218218
end do
219-
@:HardcodedDellacation()
219+
@:HardcodedDeallocation()
220220
221221
end subroutine s_icpp_line_segment
222222
@@ -280,7 +280,7 @@ contains
280280
end if
281281
end do
282282
end do
283-
@:HardcodedDellacation()
283+
@:HardcodedDeallocation()
284284

285285
end subroutine s_icpp_spiral
286286

@@ -336,7 +336,7 @@ contains
336336
end if
337337
end do
338338
end do
339-
@:HardcodedDellacation()
339+
@:HardcodedDeallocation()
340340
341341
end subroutine s_icpp_circle
342342
@@ -393,7 +393,7 @@ contains
393393
end if
394394
end do
395395
end do
396-
@:HardcodedDellacation()
396+
@:HardcodedDeallocation()
397397

398398
end subroutine s_icpp_varcircle
399399

@@ -456,7 +456,7 @@ contains
456456
end do
457457
end do
458458
end do
459-
@:HardcodedDellacation()
459+
@:HardcodedDeallocation()
460460
461461
end subroutine s_icpp_3dvarcircle
462462
@@ -513,7 +513,7 @@ contains
513513
end if
514514
end do
515515
end do
516-
@:HardcodedDellacation()
516+
@:HardcodedDeallocation()
517517

518518
end subroutine s_icpp_ellipse
519519

@@ -584,7 +584,7 @@ contains
584584
end do
585585
end do
586586
end do
587-
@:HardcodedDellacation()
587+
@:HardcodedDeallocation()
588588
589589
end subroutine s_icpp_ellipsoid
590590
@@ -653,7 +653,7 @@ contains
653653
end if
654654
end do
655655
end do
656-
@:HardcodedDellacation()
656+
@:HardcodedDeallocation()
657657

658658
end subroutine s_icpp_rectangle
659659

@@ -712,7 +712,7 @@ contains
712712
end if
713713
end do
714714
end do
715-
@:HardcodedDellacation()
715+
@:HardcodedDeallocation()
716716

717717
end subroutine s_icpp_sweep_line
718718

@@ -781,7 +781,7 @@ contains
781781
end if
782782
end do
783783
end do
784-
@:HardcodedDellacation()
784+
@:HardcodedDeallocation()
785785
786786
end subroutine s_icpp_2D_TaylorGreen_Vortex
787787
@@ -835,7 +835,7 @@ contains
835835
end if
836836
end if
837837
end do
838-
@:HardcodedDellacation()
838+
@:HardcodedDeallocation()
839839

840840
end subroutine s_icpp_1D_bubble_pulse
841841

@@ -1023,7 +1023,7 @@ contains
10231023
end do
10241024
end do
10251025
end do
1026-
@:HardcodedDellacation()
1026+
@:HardcodedDeallocation()
10271027
10281028
end subroutine s_icpp_sphere
10291029
@@ -1093,7 +1093,7 @@ contains
10931093
end do
10941094
end do
10951095
end do
1096-
@:HardcodedDellacation()
1096+
@:HardcodedDeallocation()
10971097

10981098
end subroutine s_icpp_cuboid
10991099

@@ -1188,7 +1188,7 @@ contains
11881188
end do
11891189
end do
11901190
end do
1191-
@:HardcodedDellacation()
1191+
@:HardcodedDeallocation()
11921192

11931193
end subroutine s_icpp_cylinder
11941194

@@ -1259,7 +1259,7 @@ contains
12591259
end do
12601260
end do
12611261
end do
1262-
@:HardcodedDellacation()
1262+
@:HardcodedDeallocation()
12631263

12641264
end subroutine s_icpp_sweep_plane
12651265

src/simulation/m_collisions.fpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ contains
8484
integer :: i, encoded_pid1, encoded_pid2, xp1, xp2, yp1, yp2, zp1, zp2, pid1, pid2, l ! iterators and patch IDs
8585
real(wp) :: overlap_distance
8686
real(wp), dimension(3) :: normal_vector, centroid_1, centroid_2
87-
real(wp), dimension(3) :: normal_velocity, tangental_vector, normal_force, tangental_force, torque, radial_vector, &
87+
real(wp), dimension(3) :: normal_velocity, tangential_vector, normal_force, tangential_force, torque, radial_vector, &
8888
& rotation_velocity, vel1, vel2
8989
real(wp) :: k, eta, effective_mass ! the spring stiffness and damping coefficient and mass of a specific interaction
9090

@@ -95,7 +95,7 @@ contains
9595
! Iterate over all collisions detected
9696
$:GPU_PARALLEL_LOOP(private='[i, l, encoded_pid1, encoded_pid2, xp1, xp2, yp1, yp2, zp1, zp2, pid1, pid2, centroid_1, &
9797
& centroid_2, normal_vector, overlap_distance, effective_mass, k, eta, normal_velocity, &
98-
& tangental_vector, normal_force, tangental_force, torque, radial_vector, rotation_velocity, vel1, &
98+
& tangential_vector, normal_force, tangential_force, torque, radial_vector, rotation_velocity, vel1, &
9999
& vel2]', copy='[forces, torques]')
100100
do i = 1, num_considered_collisions
101101
encoded_pid1 = collision_lookup(i, 3)
@@ -138,25 +138,25 @@ contains
138138
vel2 = patch_ib(pid2)%vel + rotation_velocity
139139

140140
normal_velocity = dot_product(vel1 - vel2, normal_vector)*normal_vector
141-
tangental_vector = (vel1 - vel2) - normal_velocity
142-
if (.not. f_approx_equal(norm2(tangental_vector), &
143-
& 0._wp)) tangental_vector = tangental_vector/norm2(tangental_vector)
141+
tangential_vector = (vel1 - vel2) - normal_velocity
142+
if (.not. f_approx_equal(norm2(tangential_vector), &
143+
& 0._wp)) tangential_vector = tangential_vector/norm2(tangential_vector)
144144

145145
! compute force and torque
146146
normal_force = -k*overlap_distance*normal_vector - eta*normal_velocity
147-
tangental_force = -ib_coefficient_of_friction*norm2(normal_force)*tangental_vector
148-
call s_cross_product(normal_vector*patch_ib(pid1)%radius, tangental_force, torque)
147+
tangential_force = -ib_coefficient_of_friction*norm2(normal_force)*tangential_vector
148+
call s_cross_product(normal_vector*patch_ib(pid1)%radius, tangential_force, torque)
149149

150150
do l = 1, num_dims
151151
! update the first IB
152152
$:GPU_ATOMIC(atomic='update')
153-
forces(pid1, l) = forces(pid1, l) + (normal_force(l) + tangental_force(l))
153+
forces(pid1, l) = forces(pid1, l) + (normal_force(l) + tangential_force(l))
154154
$:GPU_ATOMIC(atomic='update')
155155
torques(pid1, l) = torques(pid1, l) + torque(l)
156156

157157
! apply equal and opposite force/torque to second IB
158158
$:GPU_ATOMIC(atomic='update')
159-
forces(pid2, l) = forces(pid2, l) - (normal_force(l) + tangental_force(l))
159+
forces(pid2, l) = forces(pid2, l) - (normal_force(l) + tangential_force(l))
160160
$:GPU_ATOMIC(atomic='update')
161161
torques(pid2, l) = torques(pid2, l) + torque(l)*patch_ib(pid2)%radius/patch_ib(pid1)%radius
162162
end do
@@ -172,12 +172,12 @@ contains
172172

173173
real(wp), dimension(num_ibs, 3), intent(inout) :: forces, torques
174174
integer :: patch_id, i, l
175-
real(wp), dimension(3) :: normal_force, tangental_force, normal_vector, normal_velocity, tangental_vector, &
175+
real(wp), dimension(3) :: normal_force, tangential_force, normal_vector, normal_velocity, tangential_vector, &
176176
& collision_location, torque, radial_vector, rotation_velocity, velocity
177177
real(wp) :: k, eta ! the spring stiffness and damping coefficient for a specific IB
178178

179179
$:GPU_PARALLEL_LOOP(private='[patch_id, i, l, collision_location, normal_vector, k, eta, normal_velocity, &
180-
& tangental_vector, normal_force, tangental_force, torque, radial_vector, rotation_velocity, &
180+
& tangential_vector, normal_force, tangential_force, torque, radial_vector, rotation_velocity, &
181181
& velocity]', copy='[forces, torques]', collapse=2)
182182
do patch_id = 1, num_ibs
183183
do i = 1, num_dims*2
@@ -214,16 +214,16 @@ contains
214214

215215
! standard soft-sphere collision with the wall
216216
normal_velocity = dot_product(velocity, normal_vector)*normal_vector
217-
tangental_vector = velocity - normal_velocity
218-
if (.not. f_approx_equal(norm2(tangental_vector), &
219-
& 0._wp)) tangental_vector = tangental_vector/norm2(tangental_vector)
217+
tangential_vector = velocity - normal_velocity
218+
if (.not. f_approx_equal(norm2(tangential_vector), &
219+
& 0._wp)) tangential_vector = tangential_vector/norm2(tangential_vector)
220220
normal_force = -k*wall_overlap_distances(patch_id, i)*normal_vector - eta*normal_velocity
221-
tangental_force = -ib_coefficient_of_friction*norm2(normal_force)*tangental_vector
222-
call s_cross_product(normal_vector*patch_ib(patch_id)%radius, tangental_force, torque)
221+
tangential_force = -ib_coefficient_of_friction*norm2(normal_force)*tangential_vector
222+
call s_cross_product(normal_vector*patch_ib(patch_id)%radius, tangential_force, torque)
223223

224224
do l = 1, num_dims
225225
$:GPU_ATOMIC(atomic='update')
226-
forces(patch_id, l) = forces(patch_id, l) + (normal_force(l) + tangental_force(l))
226+
forces(patch_id, l) = forces(patch_id, l) + (normal_force(l) + tangential_force(l))
227227
$:GPU_ATOMIC(atomic='update')
228228
torques(patch_id, l) = torques(patch_id, l) + torque(l)
229229
end do

toolchain/mfc/test/case.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,9 +484,9 @@ def create_input_lagrange(path_test):
484484

485485
def copy_input_lagrange(path_example_input, path_test):
486486
folder_path_dest = path_test + "/input/"
487-
fite_path_dest = folder_path_dest + "lag_bubbles.dat"
487+
file_path_dest = folder_path_dest + "lag_bubbles.dat"
488488
file_path_src = common.MFC_EXAMPLE_DIRPATH + path_example_input + "/input/lag_bubbles.dat"
489489
if not os.path.exists(folder_path_dest):
490490
os.mkdir(folder_path_dest)
491491

492-
shutil.copyfile(file_path_src, fite_path_dest)
492+
shutil.copyfile(file_path_src, file_path_dest)

0 commit comments

Comments
 (0)