Commit 0dd06109 authored by Zhenguang Huang's avatar Zhenguang Huang
Browse files

Set an exception for GridResolution and move changing the BrFactor,

BrMin, FactorB0 and rMin_AWSoMR to change_awsom_param.py.
parent c688f53d
......@@ -76,29 +76,13 @@ def set_dict_params(list_params,NewParam,MAP,PFSS,TIME,MODEL,PARAM,SCHEME,strRea
else:
NewParam['replace'][paramTmp[0]] = paramTmp[1][1:-1]
else:
if paramTmp[0] == 'GridResolution':
continue
if not 'change' in NewParam.keys():
NewParam['change'] = {paramTmp[0]:paramTmp[1]}
else:
NewParam['change'][paramTmp[0]] = paramTmp[1]
# need to turn on these two commands if BrFactor and BrMin are used
if 'BrFactor' in NewParam['change'].keys() or 'BrMin' in NewParam['change'].keys():
if 'add' in NewParam.keys():
NewParam['add']=NewParam['add']+',CHANGEWEAKFIELD'
else:
NewParam['add']='CHANGEWEAKFIELD'
if 'FactorB0' in NewParam['change'].keys():
if 'add' in NewParam.keys():
NewParam['add']=NewParam['add']+',FACTORB0'
else:
NewParam['add']='FACTORB0'
# well, for 5th order scheme, there is a 0.02 thick layer above rMin for AWSoM-R
if 'rMin_AWSoMR' in NewParam['change'].keys():
NewParam['change']['rMaxLayer_AWSoMR'] = float(NewParam['change']['rMin_AWSoMR']) + 0.02
return NewParam,MAP,PFSS,TIME,MODEL,PARAM,SCHEME,strRealizations
# -----------------------------------------------------------------------------
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment