clean

Author: ChrisZYJ

src/simulation/m_hypoelastic.fpp

@@ -442,7 +442,7 @@ contains
                         sqrt_term_1 = sqrt(max(temp, 0.0_wp))
                         if (sqrt_term_1 > verysmall) then ! Avoid 0/0
                             argument = (2.0_wp*I1*I1*I1 - 9.0_wp*I1*I2 + 27.0_wp*I3)/ &
-                            (2.0_wp*sqrt_term_1*sqrt_term_1*sqrt_term_1)
+                                       (2.0_wp*sqrt_term_1*sqrt_term_1*sqrt_term_1)
                             if (argument > 1.0_wp) argument = 1.0_wp
                             if (argument < -1.0_wp) argument = -1.0_wp
                             phi = acos(argument)

src/simulation/m_rhs.fpp

@@ -174,6 +174,8 @@ contains
 
         integer :: i, j, k, l, id !< Generic loop iterators
 
+        integer :: num_eqns_after_adv
+
         !$acc enter data copyin(idwbuff, idwbuff)
         !$acc update device(idwbuff, idwbuff)
 
@@ -188,19 +190,11 @@ contains
             @:ALLOCATE(q_prim_qp%vf(l)%sf(idwbuff(1)%beg:idwbuff(1)%end, idwbuff(2)%beg:idwbuff(2)%end, idwbuff(3)%beg:idwbuff(3)%end))
         end do
 
-        if (surface_tension .or. cont_damage) then
-            ! This assumes that the color function advection equation or cont_damage is
-            ! the last equation. If this changes then this logic will
-            ! need updated
-            do l = adv_idx%end + 1, sys_size - 1
-                @:ALLOCATE(q_prim_qp%vf(l)%sf(idwbuff(1)%beg:idwbuff(1)%end, idwbuff(2)%beg:idwbuff(2)%end, idwbuff(3)%beg:idwbuff(3)%end))
-            end do
-        else
-            do l = adv_idx%end + 1, sys_size
-                @:ALLOCATE(q_prim_qp%vf(l)%sf(idwbuff(1)%beg:idwbuff(1)%end, idwbuff(2)%beg:idwbuff(2)%end, idwbuff(3)%beg:idwbuff(3)%end))
-            end do
+        num_eqns_after_adv = count((/surface_tension, cont_damage/))
 
-        end if
+        do l = adv_idx%end + 1, sys_size - num_eqns_after_adv
+            @:ALLOCATE(q_prim_qp%vf(l)%sf(idwbuff(1)%beg:idwbuff(1)%end, idwbuff(2)%beg:idwbuff(2)%end, idwbuff(3)%beg:idwbuff(3)%end))
+        end do
 
         @:ACC_SETUP_VFs(q_cons_qp, q_prim_qp)