Commit 645d4e32 authored by William D. Fullmer's avatar William D. Fullmer
Browse files

lgw: bug fixes

parent d310e9ea

liu.ge.wang/build.19.3.gnu/rdf_mod.f

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ CONTAINS 
!---------------------------------------------------------------------//

      DOUBLE PRECISION, INTENT(IN) :: EPS



      DG_0DNU = ZERO

!wdf 

! hijack CS for MA

! Local
@@ -440,6 +439,7 @@ CONTAINS 
                               + c*phi_lim**3) /(EPSmx**3 - EPS**3) ) &

              / (ONE - (EPS/EPSmx)**3)**p



!     DG_0DNU = ZERO

!     IF(MMAX == 1) DG_0DNU = (2.5D0-EPS)/(ONE - EPS)**4

!wdf

      RETURN

liu.ge.wang/build.19.3.gnu/usr1.f

+4 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
      USE run,       ONLY: TIME

!!      USE output,    ONLY: USR_DT

      USE fldvar,    ONLY: EP_g, V_g, V_s !Theta_m

      USE geometry,  ONLY: VOL

      USE compar,    ONLY: myPE, PE_IO

!!      USE bc,        ONLY: BC_V_G 

!!      USE set_bc0_flow_mod
@@ -63,8 +64,8 @@ 
!     Normalize vertical velocity variables to Vk' = Vk - jy

!     ie ' variables are relative to the zero net flux plane



      flux_tot_y = ZERO

      Vol_tot = ZERO 

      flux_tot_y = 0.0d0

      Vol_tot = 0.0d0

      DO IJK = IJKSTART3, IJKEND3

        IF (.NOT.IS_ON_myPE_wobnd(I_OF(IJK),J_OF(IJK),K_OF(IJK))) CYCLE

        IF (.NOT.FLUID_AT(IJK)) CYCLE
@@ -73,7 +74,6 @@ 
                     ( (1.0d0 - EP_G(IJK))*(V_s(IJK,1) + V_s(IJMK,1)) + &

                              + EP_G(IJK) *(V_g(IJK)   + V_g(IJMK)))

!         Vol_tot = Vol_tot + VOL(IJK) 

        ENDIF

      ENDDO



      CALL GLOBAL_ALL_SUM(flux_tot_y)
@@ -82,7 +82,7 @@ 
      Vol_tot = DBLE(XLENGTH*YLENGTH*ZLENGTH)

      flux_tot_y = flux_tot_y / Vol_tot

      

      IF (flux_tot_y .GT. 1.0d-15)

      IF (flux_tot_y .GT. 1.0d-15) THEN

        DO IJK = IJKSTART3, IJKEND3

          IF(.NOT.IS_ON_myPE_wobnd(I_OF(IJK), J_OF(IJK), K_OF(IJK))) CYCLE

          IF (.NOT.FLUID_AT(IJK)) CYCLE