Merge branch 'master' into hypo_hlld

Author: sbryngelson

src/common/m_boundary_common.fpp

@@ -171,23 +171,22 @@ contains
     subroutine s_finalize_boundary_common_module()
 
         if (bc_io) then
-            deallocate (bc_buffers(1, 1)%sf)
-            deallocate (bc_buffers(1, 2)%sf)
+            @:DEALLOCATE(bc_buffers(1, 1)%sf)
+            @:DEALLOCATE(bc_buffers(1, 2)%sf)
             #:if not MFC_CASE_OPTIMIZATION or num_dims > 1
                 if (n > 0) then
-                    deallocate (bc_buffers(2, 1)%sf)
-                    deallocate (bc_buffers(2, 2)%sf)
+                    @:DEALLOCATE(bc_buffers(2, 1)%sf)
+                    @:DEALLOCATE(bc_buffers(2, 2)%sf)
                     #:if not MFC_CASE_OPTIMIZATION or num_dims > 2
                         if (p > 0) then
-                            deallocate (bc_buffers(3, 1)%sf)
-                            deallocate (bc_buffers(3, 2)%sf)
+                            @:DEALLOCATE(bc_buffers(3, 1)%sf)
+                            @:DEALLOCATE(bc_buffers(3, 2)%sf)
                         end if
                     #:endif
                 end if
             #:endif
         end if
-
-        deallocate (bc_buffers)
+        @:DEALLOCATE(bc_buffers)
 
     end subroutine s_finalize_boundary_common_module
 

src/common/m_mpi_common.fpp

@@ -1505,7 +1505,12 @@ contains
     impure subroutine s_finalize_mpi_common_module
 
 #ifdef MFC_MPI
+#ifndef __NVCOMPILER_GPU_UNIFIED_MEM
+        @:DEALLOCATE(buff_send, buff_recv)
+#else
+        $:GPU_EXIT_DATA(delete='[buff_send, buff_recv]')
         deallocate (buff_send, buff_recv)
+#endif
 #endif
 
     end subroutine s_finalize_mpi_common_module

src/common/m_variables_conversion.fpp

@@ -1237,6 +1237,9 @@ contains
         if (bubbles_euler) then
             @:DEALLOCATE(bubrs_vc)
         end if
+        if (viscous) then
+            @:DEALLOCATE(Res_vc)
+        end if
 #else
         @:DEALLOCATE(gammas, gs_min, pi_infs, ps_inf, cvs, qvs, qvps, Gs_vc)
         if (bubbles_euler) then