From 805ca37b614a8c310ea43b0a6e99f1e393895d28 Mon Sep 17 00:00:00 2001 From: ignis Date: Sun, 24 Mar 2019 12:06:25 +0900 Subject: [PATCH] new input parameter sigw which controls sigmoid width --- code/sample/itape.py | 4 +++- code/ysolve.f90 | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/sample/itape.py b/code/sample/itape.py index 5d4c11d..e52fb6e 100644 --- a/code/sample/itape.py +++ b/code/sample/itape.py @@ -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 ) diff --git a/code/ysolve.f90 b/code/ysolve.f90 index 1e9a203..18c277b 100644 --- a/code/ysolve.f90 +++ b/code/ysolve.f90 @@ -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)