fix merge errors

wilfonba · Feb 8, 2024 · 2b5b65f · 2b5b65f
1 parent df1d819
commit 2b5b65f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git a/src/common/m_helper.fpp b/src/common/m_helper.fpp
@@ -310,33 +310,6 @@ contains
         res = trim(res)
     end subroutine
 
-    subroutine s_print_2D_array(A, div)
-
-        real(kind(0d0)), dimension(:,:) :: A
-        integer :: i, j
-        integer :: m, n
-        real :: c
-        real, optional :: div
-
-        m = size(A,1)
-        n = size(A,2)
-
-        if (present(div)) then 
-            c = div
-        else
-            c = 1
-        endif
-        
-        do i = 1,m
-            do j = 1,n
-                write(*,fmt="(F12.4)",advance="no") A(i,j)/c
-            end do
-            write(*, fmt="(A1)") " "
-        end do
-        write(*, fmt="(A1)") " "
-
-    end subroutine
-
     !> Computes the Simpson weights for quadrature
     subroutine s_simpson
 

diff --git a/src/post_process/m_mpi_proxy.fpp b/src/post_process/m_mpi_proxy.fpp
@@ -168,7 +168,7 @@ contains
             & 'heat_ratio_wrt', 'pi_inf_wrt', 'pres_inf_wrt', 'cons_vars_wrt', &
             & 'prim_vars_wrt', 'c_wrt', 'qm_wrt','schlieren_wrt', 'bubbles',   &
             & 'cf_wrt', 'polytropic', 'polydisperse', 'file_per_process',      &
-            & 'relax', 'qpmm' ]
+            & 'relax', 'qbmm' ]
             call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
         #:endfor
 

diff --git a/src/simulation/m_muscl.fpp b/src/simulation/m_muscl.fpp
@@ -186,7 +186,7 @@ contains
                                     if (slopeL < 0 ) slope = -slope
                                 elseif (muscl_lim == 2) then ! MC
                                     if (slopeL*slopeR > 0d0) then
-                                        slope = min(2d0*abs(slope1), 2d0*abs(slopeR))
+                                        slope = min(2d0*abs(slopeL), 2d0*abs(slopeR))
                                         slope = min(slope, 5d-1*(abs(slopeL + slopeR)))
                                     end if
                                     if (slopeL < 0 ) slope = -slope