new input parameter sigw which controls sigmoid width

This commit is contained in:
ignis 2019-03-24 12:06:25 +09:00
parent d74e63524f
commit 805ca37b61
2 changed files with 7 additions and 4 deletions

View file

@ -28,6 +28,7 @@ param_dict = {
"prof_wr" :1.0,
"rvis" :1.0,
"cstar" :1.0,
"sigw" :100.0,
}
file_parser.add_argument("--default", help="file containing override default values")
@ -71,7 +72,8 @@ itape = ''' nx {0[nx]}
min_wr {0[min_wr]}
prof_wr {0[prof_wr]}
rvis {0[rvis]}
cstar {0[cstar]} '''
cstar {0[cstar]}
sigw {0[sigw]} '''
print itape.format( params )

View file

@ -4,7 +4,7 @@
PRIVATE
REAL, PARAMETER :: pi=3.14159265358979323846
REAL :: hx,dt,vis,sc,diff,pre,ac,bc,tf,t_now,t_uf,dt_uf
REAL :: rvis,cstar
REAL :: rvis,cstar,sigw
REAL :: c_cut,c_ref,refwr,minf,tar_lo,u0,ctmp,l_0,lo_flm=0.
REAL :: er_lof=0., erdot=0.,min_wr,prof_wr
REAL :: pflame,pflold,oldu
@ -337,6 +337,8 @@
WRITE(otape,*) cdum,rvis
READ(itape,*) cdum,cstar
WRITE(otape,*) cdum,cstar
READ(itape,*) cdum,sigw
WRITE(otape,*) cdum,sigw
DO i = 0,100
WRITE(*,*) diffusivity_sigmoid(i / 100.)
@ -476,8 +478,7 @@
!------------------------------------------------------------------------
REAL FUNCTION diffusivity_sigmoid(c)
REAL, INTENT(IN) :: c
REAL :: a = 100.
diffusivity_sigmoid = 1. + (rvis - 1.) * sigmoid(a*(c-cstar))
diffusivity_sigmoid = 1. + (rvis - 1.) * sigmoid(sigw*(c-cstar))
END FUNCTION diffusivity_sigmoid
!------------------------------------------------------------------------
REAL FUNCTION diffusivity_T076(c)