fixing root

openwfm · Aug 14, 2020 · 7db0880 · 7db0880
1 parent c5268e3
commit 7db0880
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/simulation.py b/simulation.py
@@ -259,9 +259,9 @@ def parse_error(state, line):
  :param line: the line that created the error
  :param state: the state dictionary containing state of each tool
  """
- tools = ['geogrid', 'ungrib', 'metgrid', 'real', 'wrf']
+ tools = ['geogrid', 'ingest', 'ungrib', 'metgrid', 'real', 'wrf', 'output']
  for t in tools:
- if t in line.lower():
+ if t in line.lower() or state[t] in ['waiting','running']:
  state[t] = 'failed'
  return
 

diff --git a/wrfxctrl.py b/wrfxctrl.py
@@ -45,10 +45,10 @@
 sims_path = conf['sims_path']
 simulations = load_simulations(sims_path)
 
-root = conf['root']
+root = osp.join('/',conf['root'])
 host = conf['host']
 debug = conf['debug'] in ['T' 'True' 't' 'true']
-port=conf['port']
+port = conf['port']
 urls = {'submit': osp.normpath(root+'/submit'), 'welcome': osp.normpath(root+'/start'), 'overview': osp.normpath(root+'/overview')}
 print('Welcome page is http://%s:%s%s' % (host, port, urls['welcome']) )