Commit 42f02be6 authored by William D. Fullmer's avatar William D. Fullmer
Browse files

update mfix.dat files, remove random loop from set ic

parent 0119a1de
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -73,9 +73,9 @@ MODULE SET_IC_MOD
!wdf
       del0 = 0.5d0
       phi0 = ONE - IC_EP_G(1)
       DO J = 1, 2*96*384*8
         CALL RANDOM_NUMBER(rando)
       END DO
!       DO J = 1, 2*96*384*8
!         CALL RANDOM_NUMBER(rando)
!       END DO
!wdf

!  Set the initial conditions.
+9 −9
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@
  RUN_TYPE     = 'new'     ! new, restart_1
  UNITS        = 'SI'
  TIME         = 0.0        ! start time
  TSTOP        = 5.08d-01   ! stop time
  DT           = 5.08d-06   ! time step
  DT_MAX       = 5.08d-06   ! max time-step
  DT_MIN       = 2.54d-09   ! min time-step
  TSTOP        = 2.54d-01   ! stop time
  DT           = 1.27d-06   ! time step
  DT_MAX       = 1.27d-06   ! max time-step
  DT_MIN       = 1.27d-09   ! min time-step

  MOMENTUM_X_EQ(0)  = .TRUE.   ! solve gas x-mom eq, granular: use .FALSE.
  MOMENTUM_Y_EQ(0)  = .TRUE.   ! solve gas y-mom eq, granular: use .FALSE.
@@ -29,11 +29,11 @@

! --------------------------- NUMERICAL PARAMETERS SECTION --------------------------

  NORM_S       = 0    ! normalize continuity equation residual
  NORM_G       = 0
  NORM_S       = 1    ! normalize continuity equation residual
  NORM_G       = 1
  MAX_NIT      = 100     !xx 100 ! number of total iterations allowed
  TOL_RESID    = 2e-04  !xx 1e-08 ! total tolerance
  TOL_RESID_Th = 2e-04  !xx 1e-08 ! Tolerance for granular temperature
  TOL_RESID    = 1e-04  !xx 1e-08 ! total tolerance
  TOL_RESID_Th = 1e-04  !xx 1e-08 ! Tolerance for granular temperature
!
!0 =fou, 2 =superbee, 6 =MUSCL, 8 =minmod
!
@@ -42,7 +42,7 @@
  LEQ_IT    = 9*500   ! set number of iterations in linear solver to 500 for all nine base equation types
  LEQ_TOL    = 9*1D-10   ! set tolerance for all nine equation types
!          P_g  phi  U_k  V_k  W_k  enrgy  spcs  Thta  k-e
  UR_FAC = 1.0  1.0  1.0  1.0  1.0  1.0    1.0   0.8   1.0
  UR_FAC = 0.8  0.8  0.8  0.8  0.8  1.0    1.0   0.8   1.0
  LEQ_PC = 9*'NONE'


+9 −9
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@
  RUN_TYPE     = 'new'     ! new, restart_1
  UNITS        = 'SI'
  TIME         = 0.0        ! start time
  TSTOP        = 5.08d-01   ! stop time
  DT           = 5.08d-06   ! time step
  DT_MAX       = 5.08d-06   ! max time-step
  DT_MIN       = 2.54d-09   ! min time-step
  TSTOP        = 2.54d-01   ! stop time
  DT           = 1.27d-06   ! time step
  DT_MAX       = 1.27d-06   ! max time-step
  DT_MIN       = 1.27d-09   ! min time-step

  MOMENTUM_X_EQ(0)  = .TRUE.   ! solve gas x-mom eq, granular: use .FALSE.
  MOMENTUM_Y_EQ(0)  = .TRUE.   ! solve gas y-mom eq, granular: use .FALSE.
@@ -29,11 +29,11 @@

! --------------------------- NUMERICAL PARAMETERS SECTION --------------------------

  NORM_S       = 0    ! normalize continuity equation residual
  NORM_G       = 0
  NORM_S       = 1    ! normalize continuity equation residual
  NORM_G       = 1
  MAX_NIT      = 100     !xx 100 ! number of total iterations allowed
  TOL_RESID    = 2e-04  !xx 1e-08 ! total tolerance
  TOL_RESID_Th = 2e-04  !xx 1e-08 ! Tolerance for granular temperature
  TOL_RESID    = 1e-04  !xx 1e-08 ! total tolerance
  TOL_RESID_Th = 1e-04  !xx 1e-08 ! Tolerance for granular temperature
!
!0 =fou, 2 =superbee, 6 =MUSCL, 8 =minmod
!
@@ -42,7 +42,7 @@
  LEQ_IT    = 9*500   ! set number of iterations in linear solver to 500 for all nine base equation types
  LEQ_TOL    = 9*1D-10   ! set tolerance for all nine equation types
!          P_g  phi  U_k  V_k  W_k  enrgy  spcs  Thta  k-e
  UR_FAC = 1.0  1.0  1.0  1.0  1.0  1.0    1.0   0.8   1.0
  UR_FAC = 0.8  0.8  0.8  0.8  0.8  1.0    1.0   0.8   1.0
  LEQ_PC = 9*'NONE'


+9 −9
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@
  RUN_TYPE     = 'new'     ! new, restart_1
  UNITS        = 'SI'
  TIME         = 0.0        ! start time
  TSTOP        = 5.08d-01   ! stop time
  DT           = 5.08d-06   ! time step
  DT_MAX       = 5.08d-06   ! max time-step
  DT_MIN       = 2.54d-09   ! min time-step
  TSTOP        = 2.54d-01   ! stop time
  DT           = 1.27d-06   ! time step
  DT_MAX       = 1.27d-06   ! max time-step
  DT_MIN       = 1.27d-09   ! min time-step

  MOMENTUM_X_EQ(0)  = .TRUE.   ! solve gas x-mom eq, granular: use .FALSE.
  MOMENTUM_Y_EQ(0)  = .TRUE.   ! solve gas y-mom eq, granular: use .FALSE.
@@ -29,11 +29,11 @@

! --------------------------- NUMERICAL PARAMETERS SECTION --------------------------

  NORM_S       = 0    ! normalize continuity equation residual
  NORM_G       = 0
  NORM_S       = 1    ! normalize continuity equation residual
  NORM_G       = 1
  MAX_NIT      = 100     !xx 100 ! number of total iterations allowed
  TOL_RESID    = 2e-04  !xx 1e-08 ! total tolerance
  TOL_RESID_Th = 2e-04  !xx 1e-08 ! Tolerance for granular temperature
  TOL_RESID    = 1e-04  !xx 1e-08 ! total tolerance
  TOL_RESID_Th = 1e-04  !xx 1e-08 ! Tolerance for granular temperature
!
!0 =fou, 2 =superbee, 6 =MUSCL, 8 =minmod
!
@@ -42,7 +42,7 @@
  LEQ_IT    = 9*500   ! set number of iterations in linear solver to 500 for all nine base equation types
  LEQ_TOL    = 9*1D-10   ! set tolerance for all nine equation types
!          P_g  phi  U_k  V_k  W_k  enrgy  spcs  Thta  k-e
  UR_FAC = 1.0  1.0  1.0  1.0  1.0  1.0    1.0   0.8   1.0
  UR_FAC = 0.8  0.8  0.8  0.8  0.8  1.0    1.0   0.8   1.0
  LEQ_PC = 9*'NONE'